PlzNavigate: test updates post beforeUnload IPC refactor.

content/test/test_render_frame_host.h

Index: content/test/test_render_frame_host.h
diff --git a/content/test/test_render_frame_host.h b/content/test/test_render_frame_host.h
index fcf4a743655636f287c6fdd66b1c4cc16bcedf84..239fd76b203c0de0bed7b72dff176c699b452f42 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 this method is a no-op.

[clamy, 2015/02/25 17:10:33]

nit: "current navigation logic"

[carlosk, 2015/02/25 19:30:21]

Done.

+  // PlzNavigate: this method simulates receiving a BeginNavigation IPC.
+  void SendRendererInitiatedNavigationRequest(const GURL& url,
+                                              bool has_user_gesture);
 
   void DidDisownOpener();
 
@@ -102,7 +106,12 @@ 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 IPC to |redirect_url|.
+  void PrepareForCommitWithServerRedirect(const GURL& redirect_url);
 
   // Simulate receiving a FrameHostMsg_BeforeUnloadHandlersPresent.
   void SendBeforeUnloadHandlersPresent(bool present);
@@ -111,6 +120,11 @@ class TestRenderFrameHost : public RenderFrameHostImpl,
   void SendUnloadHandlersPresent(bool present);
 
  private:
+  // Actual implementation of both PrepareForCommit* methods.
+  // PlzNavigate: If |redirect_url| is not nullptr, it will be used to simulate
+  // a PlzNavigate server redirect.
+  void PrepareForCommitInternal(const GURL* redirect_url);
+
   TestRenderFrameHostCreationObserver child_creation_observer_;
 
   std::string contents_mime_type_;