Pass FrameTreeNode (not RenderFrameHost) to NavigateToEntry.

content/browser/frame_host/navigator_impl.cc

Index: content/browser/frame_host/navigator_impl.cc
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
index 032f4e3d32e1ee40bb94c01ae090a7aa595ad5e4..526e8de6016b0532d0c6cf505ddf61f115dc94fe 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -321,7 +321,7 @@ void NavigatorImpl::DidFailLoadWithError(
 }
 
 bool NavigatorImpl::NavigateToEntry(
-    RenderFrameHostImpl* render_frame_host,
+    FrameTreeNode* frame_tree_node,
     const NavigationEntryImpl& entry,
     NavigationController::ReloadType reload_type) {
   TRACE_EVENT0("browser,navigation", "NavigatorImpl::NavigateToEntry");
@@ -340,15 +340,14 @@ bool NavigatorImpl::NavigateToEntry(
   // capture the time needed for the RenderFrameHost initialization.
   base::TimeTicks navigation_start = base::TimeTicks::Now();
 
-  RenderFrameHostManager* manager =
-      render_frame_host->frame_tree_node()->render_manager();
+  RenderFrameHostManager* manager = frame_tree_node->render_manager();
 
   // PlzNavigate: the RenderFrameHosts are no longer asked to navigate.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableBrowserSideNavigation)) {
     navigation_data_.reset(new NavigationMetricsData(
         navigation_start, entry.GetURL(), entry.restore_type()));
-    RequestNavigation(render_frame_host->frame_tree_node(),
+    RequestNavigation(frame_tree_node,

[alexmos, 2015/02/20 00:53:47]

Nit: seems like it should fit on one line now.

[Charlie Reis, 2015/02/20 00:58:50]

Done.

                       entry,
                       reload_type,
                       navigation_start);
@@ -369,7 +368,7 @@ bool NavigatorImpl::NavigateToEntry(
 
   // Notify observers that we will navigate in this RenderFrame.
   if (delegate_) {
-    delegate_->AboutToNavigateRenderFrame(render_frame_host,
+    delegate_->AboutToNavigateRenderFrame(frame_tree_node->current_frame_host(),

[Charlie Reis, 2015/02/19 23:44:26]

This notification is deprecated, but it needs the current RFH until we remove
it.  This change should be equivalent to how it behaved before, since we only
called NavigatorImpl::NavigateToEntry from
WebContentsImpl::NavigateToPendingEntry.

                                           dest_render_frame_host);
   }
 
@@ -423,10 +422,10 @@ bool NavigatorImpl::NavigateToEntry(
 }
 
 bool NavigatorImpl::NavigateToPendingEntry(
-    RenderFrameHostImpl* render_frame_host,
+    FrameTreeNode* frame_tree_node,
     NavigationController::ReloadType reload_type) {
   return NavigateToEntry(
-      render_frame_host,
+      frame_tree_node,
       *NavigationEntryImpl::FromNavigationEntry(controller_->GetPendingEntry()),
       reload_type);
 }