Add ref-count on RenderViewHost for each new RenderFrameProxyHost.

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 73a82785072d1a0d3ecc6d67adc62b847ae163dc..4389f931e5d9565f5b36c93f4cd104517d65d28d 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -598,7 +598,8 @@ void RenderFrameHostManager::SwapOutOldFrame(
   // (There should not be one yet.)
   CHECK(!GetRenderFrameProxyHost(old_render_frame_host->GetSiteInstance()));
   RenderFrameProxyHost* proxy = new RenderFrameProxyHost(
-      old_render_frame_host->GetSiteInstance(), frame_tree_node_);
+      old_render_frame_host->GetSiteInstance(),
+      old_render_frame_host->render_view_host(), frame_tree_node_);
   CHECK(proxy_hosts_.insert(std::make_pair(old_site_instance_id, proxy)).second)
       << "Inserting a duplicate item.";
 
@@ -640,8 +641,8 @@ void RenderFrameHostManager::DiscardUnusedFrame(
     render_frame_host->CancelSuspendedNavigations();
 
     CHECK(!GetRenderFrameProxyHost(site_instance));
-    RenderFrameProxyHost* proxy =
-        new RenderFrameProxyHost(site_instance, frame_tree_node_);
+    RenderFrameProxyHost* proxy = new RenderFrameProxyHost(
+        site_instance, render_frame_host->render_view_host(), frame_tree_node_);
     proxy_hosts_[site_instance->GetId()] = proxy;
 
     // Check if the RenderFrameHost is already swapped out, to avoid swapping it
@@ -1501,7 +1502,8 @@ scoped_ptr<RenderFrameHostImpl> RenderFrameHostManager::CreateRenderFrame(
       new_render_frame_host->GetProcess()->AddPendingView();
     } else {
       proxy = new RenderFrameProxyHost(
-          new_render_frame_host->GetSiteInstance(), frame_tree_node_);
+          new_render_frame_host->GetSiteInstance(),
+          new_render_frame_host->render_view_host(), frame_tree_node_);
       proxy_hosts_[instance->GetId()] = proxy;
       proxy_routing_id = proxy->GetRoutingID();
       proxy->TakeFrameHostOwnership(new_render_frame_host.Pass());
@@ -1568,7 +1570,9 @@ int RenderFrameHostManager::CreateRenderFrameProxy(SiteInstance* instance) {
     return proxy->GetRoutingID();
 
   if (!proxy) {
-    proxy = new RenderFrameProxyHost(instance, frame_tree_node_);
+    proxy = new RenderFrameProxyHost(
+        instance, frame_tree_node_->frame_tree()->GetRenderViewHost(instance),

[ncarter (slow), 2015/05/22 23:03:13]

Would it be worth adding a comment here about why it's guaranteed here that the
RVH already exists (and isn't on the pending delete list)? I think the
invariants guaranteeing that are pretty spread out, and certainly not obvious.

[nasko, 2015/05/22 23:46:49]

This is just temporary. My bigger CL to remove swapped out will create the RVH
in this method if it didn't already exist and pass it in.

[ncarter (slow), 2015/05/23 00:33:36]

Acknowledged.

+        frame_tree_node_);
     proxy_hosts_[instance->GetId()] = proxy;
   }
   proxy->InitRenderFrameProxy();