PlzNavigate: test updates post beforeUnload IPC refactor.

This CL adapts several test classes with changes due now that
the IPCS for beforeUnload ack and renderer navigation requests are not
one and the same anymore.

BUG=440266

Review URL: https://codereview.chromium.org/953503002

Cr-Commit-Position: refs/heads/master@{#319049}

1 files changed, 12 insertions, 2 deletions

diff --git a/content/test/test_render_frame_host.h b/content/test/test_render_frame_host.h
index fcf4a74..333c2d7 100644
--- a/content/test/test_render_frame_host.h
+++ b/content/test/test_render_frame_host.h
@@ -85,7 +85,11 @@ class TestRenderFrameHost : public RenderFrameHostImpl,
       int response_code,
       const base::FilePath* file_path_for_history_item,
       const std::vector<GURL>& redirects);
-  void SendBeginNavigationWithURL(const GURL& url, bool has_user_gesture);
+
+  // With the current navigation logic this method is a no-op.
+  // PlzNavigate: this method simulates receiving a BeginNavigation IPC.
+  void SendRendererInitiatedNavigationRequest(const GURL& url,
+                                              bool has_user_gesture);
 
   void DidDisownOpener();
 
@@ -102,7 +106,13 @@ class TestRenderFrameHost : public RenderFrameHostImpl,
   // this simulates a BeforeUnload ACK from the renderer.
   // PlzNavigate: this simulates a BeforeUnload ACK from the renderer, and the
   // interaction with the IO thread up until the response is ready to commit.
-  void PrepareForCommit(const GURL& url);
+  void PrepareForCommit();
+
+  // This method does the same as PrepareForCommit.
+  // PlzNavigate: Beyond doing the same as PrepareForCommit, this method will
+  // also simulate a server redirect to |redirect_url|. If the URL is empty the
+  // redirect step is ignored.
+  void PrepareForCommitWithServerRedirect(const GURL& redirect_url);
 
   // Simulate receiving a FrameHostMsg_BeforeUnloadHandlersPresent.
   void SendBeforeUnloadHandlersPresent(bool present);