PlzNavigate: test updates post beforeUnload IPC refactor.

content/test/test_render_frame_host.h

 // Copyright 2013 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_TEST_TEST_RENDER_FRAME_HOST_H_
 #define CONTENT_TEST_TEST_RENDER_FRAME_HOST_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 67 matching lines @@
       const GURL& url,
       const std::vector<GURL>& redirects);
   void SendNavigateWithParameters(
       int page_id,
       const GURL& url,
       ui::PageTransition transition,
       const GURL& original_request_url,
       int response_code,
       const base::FilePath* file_path_for_history_item,
       const std::vector<GURL>& redirects);
+
+  // Normally this is a no-op.

[clamy, 2015/02/25 14:29:49]

nit: I think you could add a sentence about the intention behind this method as
I find that starting with this first sentence is a bit weird.

[carlosk, 2015/02/25 16:08:00]

I followed what was done in other similarly commented methods where we initially
explain what it normally does and then after a PlzNavigate prefix explain what
happens when browser side navigation is enabled.

I improved it a little but I don't know how to change it further without being
redundant with the PlzNavigate part.

+  // PlzNavigate: this method simulates receiving a navigation request IPC.

[clamy, 2015/02/25 14:29:49]

s/navigation request/BeginNavigation

[carlosk, 2015/02/25 16:08:00]

Done.

   void SendBeginNavigationWithURL(const GURL& url, bool has_user_gesture);
 
   void DidDisownOpener();
 
   // If set, navigations will appear to have cleared the history list in the
   // RenderFrame
   // (FrameHostMsg_DidCommitProvisionalLoad_Params::history_list_was_cleared).
   // False by default.
   void set_simulate_history_list_was_cleared(bool cleared) {
     simulate_history_list_was_cleared_ = cleared;
   }
 
   // Advances the RenderFrameHost (and through it the RenderFrameHostManager) to
   // a state where a new navigation can be committed by a renderer. Currently,
   // 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);
 
   // Simulate receiving a FrameHostMsg_UnloadHandlersPresent.
   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_;
 
   // See set_simulate_history_list_was_cleared() above.
   bool simulate_history_list_was_cleared_;
 
   DISALLOW_COPY_AND_ASSIGN(TestRenderFrameHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_TEST_TEST_RENDER_FRAME_HOST_H_