Fix some unit_tests under PlzNavigate

content/public/test/test_renderer_host.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_
 #define CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 37 matching lines @@
 
 // An interface and utility for driving tests of RenderFrameHost.
 class RenderFrameHostTester {
  public:
   // Retrieves the RenderFrameHostTester that drives the specified
   // RenderFrameHost. The RenderFrameHost must have been created while
   // RenderFrameHost testing was enabled; use a
   // RenderViewHostTestEnabler instance (see below) to do this.
   static RenderFrameHostTester* For(RenderFrameHost* host);
 
-  // If the given NavigationController has a pending main frame, returns it,
-  // otherwise NULL. This is an alternative to
-  // WebContentsTester::GetPendingMainFrame() when your WebContents was not
-  // created via a TestWebContents.
-  static RenderFrameHost* GetPendingForController(
-      NavigationController* controller);
+  static void CommitPendingLoad(NavigationController* controller);
 
   virtual ~RenderFrameHostTester() {}
 
   // Simulates initialization of the RenderFrame object in the renderer process
   // and ensures internal state of RenderFrameHost is ready for simulating
   // RenderFrame originated IPCs.
   virtual void InitializeRenderFrameIfNeeded() = 0;
 
   // Gives tests access to RenderFrameHostImpl::OnCreateChild. The returned
   // RenderFrameHost is owned by the parent RenderFrameHost.
@@ skipping 15 matching lines @@
 
   // Simulates a navigation to |url| failing with the error code |error_code|.
   virtual void SimulateNavigationError(const GURL& url, int error_code) = 0;
 
   // Simulates the commit of an error page following a navigation failure.
   virtual void SimulateNavigationErrorPageCommit() = 0;
 
   // Simulates a navigation stopping in the RenderFrameHost.
   virtual void SimulateNavigationStop() = 0;
 
+  // If we are doing a cross-site navigation, this simulates the current
+  // RenderFrameHost notifying that BeforeUnload has executed so the pending
+  // RenderFrameHost is resumed and can navigate.
+  // PlzNavigate: This simulates a BeforeUnload ACK from the renderer, and the
+  // interaction with the IO thread up until the response is ready to commit.
+  virtual void PrepareForCommitIfNecessary() = 0;

[clamy, 2016/09/01 00:00:18]

We're no longer using this outside of content/ right? If so, it should be
removed from the public API.

[scottmg, 2016/09/01 02:33:19]

Ah, right. Done.

+
   // Calls OnDidCommitProvisionalLoad on the RenderFrameHost with the given
   // information with various sets of parameters. These are helper functions for
   // simulating the most common types of loads.
   //
   // Guidance for calling these:
   // - nav_entry_id should be 0 if simulating a renderer-initiated navigation;
   //   if simulating a browser-initiated one, pass the GetUniqueID() value of
   //   the NavigationController's PendingEntry.
   // - did_create_new_entry should be true if simulating a navigation that
   //   created a new navigation entry; false for history navigations, reloads,
@@ skipping 173 matching lines @@
   std::unique_ptr<aura::test::AuraTestHelper> aura_test_helper_;
 #endif
   RenderViewHostTestEnabler rvh_test_enabler_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_