Fix some unit_tests under PlzNavigate

content/public/test/test_renderer_host.h

Index: content/public/test/test_renderer_host.h
diff --git a/content/public/test/test_renderer_host.h b/content/public/test/test_renderer_host.h
index 3a645cf51c92f2da3aae875fd2ba889c050eb873..644651e91584296661660bc58e67420fa7fc4b9c 100644
--- a/content/public/test/test_renderer_host.h
+++ b/content/public/test/test_renderer_host.h
@@ -55,12 +55,7 @@ class RenderFrameHostTester {
   // 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() {}
 
@@ -96,6 +91,13 @@ class RenderFrameHostTester {
   // 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.