Clean up code after previous refactor

1. It is no longer possible to cause recursion in
RestoreScrollPositionAndViewState, so delete code that protects against
that.
2. Remove now-unused parameter.

Refactor CL: https://chromium-review.googlesource.com/c/chromium/src/+/1981806

Change-Id: I93d99d1a301f97303186459949963c1da11144d6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1982788Reviewed-by: Stefan Zager <szager@chromium.org>
Reviewed-by: David Bokan <bokan@chromium.org>
Commit-Queue: Chris Harrelson <chrishtr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728265}

third_party/blink/renderer/core/loader/frame_loader.cc

@@ -176,7 +176,6 @@ ResourceRequest FrameLoader::ResourceRequestForReload(
 FrameLoader::FrameLoader(LocalFrame* frame)
     : frame_(frame),
       progress_tracker_(MakeGarbageCollected<ProgressTracker>(frame)),
-      in_restore_scroll_(false),
       forced_sandbox_flags_(WebSandboxFlags::kNone),
       dispatching_did_clear_window_object_in_main_world_(false),
       detached_(false),
@@ -450,8 +449,7 @@ void FrameLoader::DidFinishSameDocumentNavigation(
                                        : SerializedScriptValue::NullValue());
 
   if (view_state) {
-    RestoreScrollPositionAndViewState(frame_load_type,
-                                      true /* is_same_document */, *view_state,
+    RestoreScrollPositionAndViewState(frame_load_type, *view_state,
                                       history_item->ScrollRestorationType());
   }
 
@@ -1175,20 +1173,17 @@ void FrameLoader::CommitDocumentLoader(
 void FrameLoader::RestoreScrollPositionAndViewState() {
   if (!frame_->GetPage() || !GetDocumentLoader() ||
       !GetDocumentLoader()->GetHistoryItem() ||
-      !GetDocumentLoader()->GetHistoryItem()->GetViewState() ||
-      in_restore_scroll_) {
+      !GetDocumentLoader()->GetHistoryItem()->GetViewState()) {
     return;
   }
-  base::AutoReset<bool> in_restore_scroll(&in_restore_scroll_, true);
   RestoreScrollPositionAndViewState(
-      GetDocumentLoader()->LoadType(), false /* is_same_document */,
+      GetDocumentLoader()->LoadType(),
       *GetDocumentLoader()->GetHistoryItem()->GetViewState(),
       GetDocumentLoader()->GetHistoryItem()->ScrollRestorationType());
 }
 
 void FrameLoader::RestoreScrollPositionAndViewState(
     WebFrameLoadType load_type,
-    bool is_same_document,
     const HistoryItem::ViewState& view_state,
     HistoryScrollRestorationType scroll_restoration_type) {
   LocalFrameView* view = frame_->View();

third_party/blink/renderer/core/loader/frame_loader.h

@@ -261,7 +261,6 @@ class CORE_EXPORT FrameLoader final {
   void ClearClientNavigation();
 
   void RestoreScrollPositionAndViewState(WebFrameLoadType,
-                                         bool is_same_document,
                                          const HistoryItem::ViewState&,
                                          HistoryScrollRestorationType);
 
@@ -314,8 +313,6 @@ class CORE_EXPORT FrameLoader final {
   };
   std::unique_ptr<ClientNavigationState> client_navigation_;
 
-  bool in_restore_scroll_;
-
   WebSandboxFlags forced_sandbox_flags_;
   // A snapshot value of frame_owner's sandbox flags states at the beginning of
   // navigation. For main frame which does not have a frame owner, the value is