Fix some unit_tests under PlzNavigate

chrome/test/base/browser_with_test_window_test.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/test/base/browser_with_test_window_test.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "base/location.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile_destroyer.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/browser_side_navigation_policy.h"
+#include "content/public/test/browser_side_navigation_test_utils.h"
 #include "content/public/test/test_renderer_host.h"
 #include "ui/base/page_transition_types.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/test/ash_test_helper.h"
 #elif defined(TOOLKIT_VIEWS)
 #include "ui/views/test/scoped_views_test_helper.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
@@ skipping 26 matching lines @@
       base::MessageLoopForUI::current()));
   ash_test_helper_->SetUp(true,
                           ash::MaterialDesignController::Mode::UNINITIALIZED);
 #elif defined(TOOLKIT_VIEWS)
   views_test_helper_.reset(new views::ScopedViewsTestHelper());
 #endif
 #if defined(TOOLKIT_VIEWS)
   SetConstrainedWindowViewsClient(CreateChromeConstrainedWindowViewsClient());
 #endif
 
+  if (content::IsBrowserSideNavigationEnabled())
+    content::BrowserSideNavigationSetUp();
+
   // Subclasses can provide their own Profile.
   profile_ = CreateProfile();
   // Subclasses can provide their own test BrowserWindow. If they return NULL
   // then Browser will create the a production BrowserWindow and the subclass
   // is responsible for cleaning it up (usually by NativeWidget destruction).
   window_.reset(CreateBrowserWindow());
 
   browser_.reset(
       CreateBrowser(profile(), browser_type_, hosted_app_, window_.get()));
 }
 
 void BrowserWithTestWindowTest::TearDown() {
   // Some tests end up posting tasks to the DB thread that must be completed
   // before the profile can be destroyed and the test safely shut down.
   base::RunLoop().RunUntilIdle();
 
   // Reset the profile here because some profile keyed services (like the
   // audio service) depend on test stubs that the helpers below will remove.
   DestroyBrowserAndProfile();
 
+  if (content::IsBrowserSideNavigationEnabled())
+    content::BrowserSideNavigationTearDown();
+
 #if defined(TOOLKIT_VIEWS)
   constrained_window::SetConstrainedWindowViewsClient(nullptr);
 #endif
 
 #if defined(OS_CHROMEOS)
   ash_test_helper_->TearDown();
 #elif defined(TOOLKIT_VIEWS)
   views_test_helper_.reset();
 #endif
 
@@ skipping 22 matching lines @@
   params.disposition = NEW_FOREGROUND_TAB;
   chrome::Navigate(&params);
   CommitPendingLoad(&params.target_contents->GetController());
 }
 
 void BrowserWithTestWindowTest::CommitPendingLoad(
   NavigationController* controller) {
   if (!controller->GetPendingEntry())
     return;  // Nothing to commit.
 
-  RenderFrameHost* old_rfh = controller->GetWebContents()->GetMainFrame();
-
-  RenderFrameHost* pending_rfh = RenderFrameHostTester::GetPendingForController(
-      controller);
-  if (pending_rfh) {
-    // Simulate the BeforeUnload_ACK that is received from the current renderer
-    // for a cross-site navigation.
-    DCHECK_NE(old_rfh, pending_rfh);
-    RenderFrameHostTester::For(old_rfh)->SendBeforeUnloadACK(true);
-  }
-  // Commit on the pending_rfh, if one exists.
-  RenderFrameHost* test_rfh = pending_rfh ? pending_rfh : old_rfh;
-  RenderFrameHostTester* test_rfh_tester = RenderFrameHostTester::For(test_rfh);
-
-  // Simulate a SwapOut_ACK before the navigation commits.
-  if (pending_rfh)
-    RenderFrameHostTester::For(old_rfh)->SimulateSwapOutACK();
-
-  // For new navigations, we need to send a larger page ID. For renavigations,
-  // we need to send the preexisting page ID. We can tell these apart because
-  // renavigations will have a pending_entry_index while new ones won't (they'll
-  // just have a standalong pending_entry that isn't in the list already).
-  if (controller->GetPendingEntryIndex() >= 0) {
-    test_rfh_tester->SendNavigateWithTransition(
-        controller->GetPendingEntry()->GetPageID(),
-        controller->GetPendingEntry()->GetUniqueID(),
-        false,
-        controller->GetPendingEntry()->GetURL(),
-        controller->GetPendingEntry()->GetTransitionType());
-  } else {
-    test_rfh_tester->SendNavigateWithTransition(
-        controller->GetWebContents()->GetMaxPageIDForSiteInstance(
-            test_rfh->GetSiteInstance()) + 1,
-        controller->GetPendingEntry()->GetUniqueID(),
-        true,
-        controller->GetPendingEntry()->GetURL(),
-        controller->GetPendingEntry()->GetTransitionType());
-  }
+  RenderFrameHostTester::CommitPendingLoad(controller);

[nasko, 2016/08/31 19:45:24]

Awesome! This (pun intended) was exactly what I had in mind. Thanks for being a
great mind-reader for folks like me that can't put coherent english together :).

 }
 
 void BrowserWithTestWindowTest::NavigateAndCommit(
     NavigationController* controller,
     const GURL& url) {
   controller->LoadURL(
       url, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
   CommitPendingLoad(controller);
 }
 
@@ skipping 51 matching lines @@
   Browser::CreateParams params(profile);
   if (hosted_app) {
     params = Browser::CreateParams::CreateForApp(
         "Test", true /* trusted_source */, gfx::Rect(), profile);
   } else {
     params.type = browser_type;
   }
   params.window = browser_window;
   return new Browser(params);
 }