Revert of Don't clear pending NavigationParams until didStopLoading.

chrome/browser/printing/print_preview_dialog_controller_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/printing/print_preview_dialog_controller.h"
 
 #include <memory>
 
 #include "base/bind_helpers.h"
 #include "base/location.h"
@@ skipping 40 matching lines @@
   void set_quit_closure(const base::Closure& quit_closure) {
     quit_closure_ = quit_closure;
   }
 
  private:
   // content::WebContentsObserver implementation.
   bool OnMessageReceived(const IPC::Message& message) override {
     IPC_BEGIN_MESSAGE_MAP(RequestPrintPreviewObserver, message)
       IPC_MESSAGE_HANDLER(PrintHostMsg_RequestPrintPreview,
                           OnRequestPrintPreview)
-      IPC_MESSAGE_HANDLER(PrintHostMsg_SetupScriptedPrintPreview,
-                          OnSetupScriptedPrintPreview)
       IPC_MESSAGE_UNHANDLED(break)
     IPC_END_MESSAGE_MAP()
     return false;  // Report not handled so the real handler receives it.
   }
 
   void OnRequestPrintPreview(
       const PrintHostMsg_RequestPrintPreview_Params& /* params */) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, quit_closure_);
   }
 
-  void OnSetupScriptedPrintPreview() {
-    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, quit_closure_);
-  }
-
   base::Closure quit_closure_;
 
   DISALLOW_COPY_AND_ASSIGN(RequestPrintPreviewObserver);
 };
 
 class PrintPreviewDialogClonedObserver : public WebContentsObserver {
  public:
   explicit PrintPreviewDialogClonedObserver(WebContents* dialog)
       : WebContentsObserver(dialog) {
   }
   ~PrintPreviewDialogClonedObserver() override {}
 
   RequestPrintPreviewObserver* request_preview_dialog_observer() {
     return request_preview_dialog_observer_.get();
   }
 
  private:
   // content::WebContentsObserver implementation.
   void DidCloneToNewWebContents(WebContents* old_web_contents,
                                 WebContents* new_web_contents) override {
     request_preview_dialog_observer_.reset(
         new RequestPrintPreviewObserver(new_web_contents));
   }
 
   std::unique_ptr<RequestPrintPreviewObserver> request_preview_dialog_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(PrintPreviewDialogClonedObserver);
 };
 
-class PrintPreviewDialogStartedObserver : public WebContentsObserver {
- public:
-  explicit PrintPreviewDialogStartedObserver(WebContents* dialog)
-      : WebContentsObserver(dialog), waiting_(false), dialog_started_(false) {}
-  ~PrintPreviewDialogStartedObserver() override {}
-
-  bool dialog_started() const { return dialog_started_; }
-
-  void WaitForDialogStarted() {
-    waiting_ = true;
-    run_loop_.Run();
-  }
-
- private:
-  // content::WebContentsObserver implementation.
-  void RenderViewReady() override {
-    dialog_started_ = true;
-    if (waiting_)
-      run_loop_.Quit();
-  }
-
-  void WebContentsDestroyed() override {
-    if (waiting_)
-      run_loop_.Quit();
-  }
-
-  bool waiting_;
-  bool dialog_started_;
-  base::RunLoop run_loop_;
-
-  DISALLOW_COPY_AND_ASSIGN(PrintPreviewDialogStartedObserver);
-};
-
 class PrintPreviewDialogDestroyedObserver : public WebContentsObserver {
  public:
   explicit PrintPreviewDialogDestroyedObserver(WebContents* dialog)
       : WebContentsObserver(dialog),
-        waiting_(false),
-        dialog_destroyed_(false) {}
+        dialog_destroyed_(false) {
+  }
   ~PrintPreviewDialogDestroyedObserver() override {}
 
   bool dialog_destroyed() const { return dialog_destroyed_; }
 
-  void WaitForDialogDestroyed() {
-    waiting_ = true;
-    run_loop_.Run();
-  }
-
  private:
   // content::WebContentsObserver implementation.
-  void WebContentsDestroyed() override {
-    dialog_destroyed_ = true;
-    if (waiting_)
-      run_loop_.Quit();
-  }
+  void WebContentsDestroyed() override { dialog_destroyed_ = true; }
 
-  bool waiting_;
   bool dialog_destroyed_;
-  base::RunLoop run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(PrintPreviewDialogDestroyedObserver);
 };
 
 void PluginsLoadedCallback(
     const base::Closure& quit_closure,
     const std::vector<content::WebPluginInfo>& /* info */) {
   quit_closure.Run();
 }
 
@@ skipping 36 matching lines @@
     return initiator_;
   }
 
   void PrintPreview() {
     base::RunLoop run_loop;
     request_preview_dialog_observer()->set_quit_closure(run_loop.QuitClosure());
     chrome::Print(browser());
     run_loop.Run();
   }
 
-  void PrintPreviewViaScript(base::StringPiece script) {
-    base::RunLoop run_loop;
-    request_preview_dialog_observer()->set_quit_closure(run_loop.QuitClosure());
-    initiator()->GetMainFrame()->ExecuteJavaScriptForTests(
-        base::ASCIIToUTF16(script));
-    run_loop.Run();
-  }
-
   WebContents* GetPrintPreviewDialog() {
     printing::PrintPreviewDialogController* dialog_controller =
         printing::PrintPreviewDialogController::GetInstance();
     return dialog_controller->GetPrintPreviewForContents(initiator_);
   }
 
  private:
   void SetUpOnMainThread() override {
     WebContents* first_tab =
         browser()->tab_strip_model()->GetActiveWebContents();
@@ skipping 52 matching lines @@
   // Try printing again.
   PrintPreview();
 
   // Get the print preview dialog for the initiator tab.
   WebContents* new_preview_dialog = GetPrintPreviewDialog();
 
   // Check a new preview dialog got created.
   EXPECT_TRUE(new_preview_dialog);
 }
 
-// Ensure that back/forward navigations with ScopedPageLoadDeferrers (e.g.,
-// during printing) end up committing to the correct NavigationEntry.
-// See https://crbug.com/626838.
-IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest,
-                       HistoryNavigateDuringPrint) {
-  WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
-  ui_test_utils::NavigateToURL(browser(), GURL("data:text/html,page1"));
-  ui_test_utils::NavigateToURL(browser(), GURL("data:text/html,page2"));
-  EXPECT_EQ(2, tab->GetController().GetEntryCount());
-  EXPECT_EQ(1, tab->GetController().GetLastCommittedEntryIndex());
-
-  // Go back via script, but before that gets a chance to commit, show a print
-  // dialog with a nested message loop and ScopedPageLoadDeferrer.
-  PrintPreviewViaScript("history.back(); print();");
-
-  // Get the preview dialog for the initiator tab.
-  WebContents* preview_dialog = GetPrintPreviewDialog();
-
-  // Check a new print preview dialog got created.
-  ASSERT_TRUE(preview_dialog);
-  ASSERT_NE(initiator(), preview_dialog);
-
-  bool started = preview_dialog->GetRenderProcessHost()->IsReady();
-  if (!started) {
-    PrintPreviewDialogStartedObserver started_observer(preview_dialog);
-    started_observer.WaitForDialogStarted();
-    started = started_observer.dialog_started();
-  }
-
-  if (started) {
-    // Dismiss the dialog.
-    PrintPreviewDialogDestroyedObserver destroyed_observer(preview_dialog);
-    ASSERT_TRUE(preview_dialog->GetRenderProcessHost()->Shutdown(0, true));
-    if (!destroyed_observer.dialog_destroyed()) {
-      destroyed_observer.WaitForDialogDestroyed();
-      ASSERT_TRUE(destroyed_observer.dialog_destroyed());
-    }
-  }
-  ASSERT_FALSE(GetPrintPreviewDialog());
-
-  // The back navigation should put us back on the first entry.
-  content::WaitForLoadStop(tab);
-  EXPECT_EQ(2, tab->GetController().GetEntryCount());
-  EXPECT_EQ(0, tab->GetController().GetLastCommittedEntryIndex());
-}
-
 // Test to verify that after reloading the initiator, it creates a new print
 // preview dialog.
 IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest,
                        ReloadInitiatorTab) {
   // Print for the first time.
   PrintPreview();
 
   WebContents* preview_dialog = GetPrintPreviewDialog();
 
   // Check a new print preview dialog got created.
@@ skipping 134 matching lines @@
   content::BrowserAccessibilityState::GetInstance()->EnableAccessibility();
   ui_test_utils::NavigateToURL(browser(), GURL("data:text/html,HelloWorld"));
   PrintPreview();
   WebContents* preview_dialog = GetPrintPreviewDialog();
   WaitForAccessibilityTreeToContainNodeWithName(preview_dialog, "HelloWorld");
 }
 
 }  // namespace
 
 #endif  // defined(ENABLE_TASK_MANAGER)