PlzNavigate: make content unit tests work with browser side navigation

content/browser/frame_host/render_frame_host_manager.cc

Index: content/browser/frame_host/render_frame_host_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index b36562c7f81320ac7bf6a218b45e3cc133bff27a..1501432b0263d6769e1d351e38f74995fb4c3729 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -281,7 +281,7 @@ bool RenderFrameHostManager::ShouldCloseTabOnUnresponsiveRenderer() {
   // If the tab becomes unresponsive during beforeunload while doing a
   // cross-site navigation, proceed with the navigation.  (This assumes that
   // the pending RenderFrameHost is still responsive.)
-  if (render_frame_host_->is_waiting_for_beforeunload_ack()) {
+  if (render_frame_host_->IsWaitingForBeforeUnloadACK()) {
     // Haven't gotten around to starting the request, because we're still
     // waiting for the beforeunload handler to finish.  We'll pretend that it
     // did finish, to let the navigation proceed.  Note that there's a danger
@@ -460,7 +460,6 @@ void RenderFrameHostManager::DidNavigateFrame(
   if (render_frame_host == pending_render_frame_host_) {
     // The pending cross-site navigation completed, so show the renderer.
     CommitPending();
-    cross_navigation_pending_ = false;
   } else if (render_frame_host == render_frame_host_) {
     if (was_caused_by_user_gesture) {
       // A navigation in the original page has taken place.  Cancel the pending
@@ -737,6 +736,7 @@ RenderFrameHostImpl* RenderFrameHostManager::GetFrameHostForNavigation(
     }
   }
 
+  cross_navigation_pending_ = navigation_rfh != render_frame_host_.get();

[nasko, 2015/01/21 17:21:33]

nit: If cross_navigation_pending_ is not used for PlzNavigate, why is it set
here then? This method is only used in PlzNavigate, right?

[clamy, 2015/01/21 19:39:41]

Yes, but it is checked by a certain number of tests that fail if we don't
properly set it.

[nasko, 2015/01/21 19:47:06]

Then the comment that it isn't used in PlzNavigate is incorrect. Let's fix that
at some point.

   return navigation_rfh;
 }
 
@@ -1461,6 +1461,7 @@ int RenderFrameHostManager::GetRoutingIdForSiteInstance(
 void RenderFrameHostManager::CommitPending() {
   TRACE_EVENT1("navigation", "RenderFrameHostManager::CommitPending",
                "FrameTreeNode id", frame_tree_node_->frame_tree_node_id());
+  cross_navigation_pending_ = false;

[nasko, 2015/01/21 17:21:33]

nit: I'd move this down to where we actually swap the RFHs. It would avoid a
case where a method call between here and the actual swap consults this value,
yet we are in the middle of committing.

[clamy, 2015/01/21 19:39:41]

Done.

   bool browser_side_navigation =
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableBrowserSideNavigation);