Add ref-count on RenderViewHost for each new RenderFrameProxyHost.

content/browser/frame_host/render_frame_proxy_host.cc

Index: content/browser/frame_host/render_frame_proxy_host.cc
diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc
index 6d41f873516b9a088bb9d4fed4aa3eb8a267dc65..7a81ce5d5ad0fad15d5389698056490675601ead 100644
--- a/content/browser/frame_host/render_frame_proxy_host.cc
+++ b/content/browser/frame_host/render_frame_proxy_host.cc
@@ -44,17 +44,20 @@ RenderFrameProxyHost* RenderFrameProxyHost::FromID(int process_id,
 }
 
 RenderFrameProxyHost::RenderFrameProxyHost(SiteInstance* site_instance,
+                                           RenderViewHostImpl* render_view_host,
                                            FrameTreeNode* frame_tree_node)
     : routing_id_(site_instance->GetProcess()->GetNextRoutingID()),
       site_instance_(site_instance),
       process_(site_instance->GetProcess()),
       frame_tree_node_(frame_tree_node),
-      render_frame_proxy_created_(false) {
+      render_frame_proxy_created_(false),
+      render_view_host_(render_view_host) {
   GetProcess()->AddRoute(routing_id_, this);
   CHECK(g_routing_id_frame_proxy_map.Get().insert(
       std::make_pair(
           RenderFrameProxyHostID(GetProcess()->GetID(), routing_id_),
           this)).second);
+  frame_tree_node_->frame_tree()->RegisterRenderViewHost(render_view_host_);

[Charlie Reis, 2015/05/20 23:05:00]

Should we check that render_view_host is non-null, either here or in the
register call?  (I mention it because of the possible issue in RFHM.)

[nasko, 2015/05/21 16:22:12]

I can add a CHECK if you'd prefer, but we shouldn't be getting a null RVH.

[Charlie Reis, 2015/05/21 18:48:16]

Yeah, let's put a CHECK here.  I'd like to know if this invariant fails in
practice, especially since we store it in a map.

[nasko, 2015/05/21 21:37:07]

Done.

 
   if (!frame_tree_node_->IsMainFrame() &&
       frame_tree_node_->parent()
@@ -82,6 +85,7 @@ RenderFrameProxyHost::~RenderFrameProxyHost() {
       Send(new FrameMsg_DeleteProxy(routing_id_));
   }
 
+  frame_tree_node_->frame_tree()->UnregisterRenderViewHost(render_view_host_);
   GetProcess()->RemoveRoute(routing_id_);
   g_routing_id_frame_proxy_map.Get().erase(
       RenderFrameProxyHostID(GetProcess()->GetID(), routing_id_));