Unify frame IDs with RenderFrameHost routing IDs.

content/browser/renderer_host/render_view_host_impl.cc

Index: content/browser/renderer_host/render_view_host_impl.cc
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index e87aa721f8f03ea9995a3e1fc0c4eecdc5d57a85..e3167312229bace17c89a37e66fb3319ac602cde 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -206,7 +206,6 @@ RenderViewHostImpl::RenderViewHostImpl(
       enabled_bindings_(0),
       navigations_suspended_(false),
       has_accessed_initial_document_(false),
-      main_frame_id_(-1),
       main_frame_routing_id_(main_frame_routing_id),
       run_modal_reply_msg_(NULL),
       run_modal_opener_id_(MSG_ROUTING_NONE),
@@ -668,7 +667,8 @@ void RenderViewHostImpl::OnCrossSiteResponse(
   FrameTreeNode* node = NULL;
   if (frame_id != -1 &&
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess)) {
-    node = delegate_->GetFrameTree()->FindByFrameID(frame_id);
+    node = delegate_->GetFrameTree()->FindByRoutingID(frame_id,
+                                                      GetProcess()->GetID());
   }
 
   // TODO(creis): We should always be able to get the RFHM for a frame_id,
@@ -1381,7 +1381,6 @@ void RenderViewHostImpl::OnRenderProcessGone(int status, int exit_code) {
       static_cast<base::TerminationStatus>(status);
 
   // Reset frame tree state associated with this process.
-  main_frame_id_ = -1;
   delegate_->GetFrameTree()->RenderProcessGone(this);
 
   // Our base class RenderWidgetHost needs to reset some stuff.
@@ -2111,9 +2110,6 @@ void RenderViewHostImpl::AttachToFrameTree() {
   FrameTree* frame_tree = delegate_->GetFrameTree();
 
   frame_tree->ResetForMainFrameSwap();
-  if (main_frame_id() != FrameTreeNode::kInvalidFrameId) {
-    frame_tree->OnFirstNavigationAfterSwap(main_frame_id());
-  }
 }
 
 }  // namespace content