Start using RenderFrameProxyHost objects.

content/browser/frame_host/frame_tree.cc

Index: content/browser/frame_host/frame_tree.cc
diff --git a/content/browser/frame_host/frame_tree.cc b/content/browser/frame_host/frame_tree.cc
index 1accb0e9d1bca834821244cf7785a826445a6fdd..31be80b5875c0bc4ac57466a8ee57d068ed137f0 100644
--- a/content/browser/frame_host/frame_tree.cc
+++ b/content/browser/frame_host/frame_tree.cc
@@ -54,6 +54,17 @@ bool ResetNodesForNewProcess(RenderViewHost* render_view_host,
   return true;
 }
 
+bool CreateProxyForSiteInstance(FrameTreeNode* source_node,
+                                const scoped_refptr<SiteInstance>& instance,
+                                FrameTreeNode* node) {
+  // Skip the node that initiated the creation.
+  if (source_node == node)
+    return true;
+
+  node->render_manager()->CreateRenderFrameProxy(instance, MSG_ROUTING_NONE);
+  return true;
+}
+
 }  // namespace
 
 FrameTree::FrameTree(Navigator* navigator,
@@ -137,6 +148,13 @@ void FrameTree::RemoveFrame(FrameTreeNode* child) {
   parent->RemoveChild(child);
 }
 
+void FrameTree::CreateProxiesForSiteInstance(
+    FrameTreeNode* source,
+    const scoped_refptr<SiteInstance>& site_instance) {
+  ForEach(base::Bind(
+      &CreateProxyForSiteInstance, source, site_instance));
+}
+
 void FrameTree::ResetForMainFrameSwap() {
   root_->ResetForNewProcess();
   focused_frame_tree_node_id_ = -1;
@@ -169,25 +187,30 @@ void FrameTree::SetFrameRemoveListener(
   on_frame_removed_ = on_frame_removed;
 }
 
-RenderViewHostImpl* FrameTree::CreateRenderViewHostForMainFrame(
-    SiteInstance* site_instance,
-    int routing_id,
-    int main_frame_routing_id,
-    bool swapped_out,
-    bool hidden) {
+RenderViewHostImpl* FrameTree::CreateRenderViewHost(SiteInstance* site_instance,
+                                                    int routing_id,
+                                                    int main_frame_routing_id,
+                                                    bool swapped_out,
+                                                    bool hidden) {
+  LOG(ERROR) << "FT::CreateRVHForMainFrame: "
+    << site_instance->GetSiteURL() << ":" << routing_id << ":"
+    << main_frame_routing_id << ", swapped_out: " << swapped_out;
   DCHECK(main_frame_routing_id != MSG_ROUTING_NONE);
   RenderViewHostMap::iterator iter =
       render_view_host_map_.find(site_instance->GetId());
   if (iter != render_view_host_map_.end()) {
     // If a RenderViewHost is pending shutdown for this |site_instance|, put it
-    // in the map of RenderViewHosts pending shutdown. Otherwise there should
-    // not be a RenderViewHost for the SiteInstance.
-    CHECK_EQ(RenderViewHostImpl::STATE_PENDING_SHUTDOWN,
-             iter->second->rvh_state());
-    render_view_host_pending_shutdown_map_.insert(
-        std::pair<int, RenderViewHostImpl*>(site_instance->GetId(),
-                                            iter->second));
-    render_view_host_map_.erase(iter);
+    // in the map of RenderViewHosts pending shutdown. Otherwise return the
+    // existing RenderViewHost for the SiteInstance.
+    if (iter->second->rvh_state() == RenderViewHostImpl::STATE_PENDING_SHUTDOWN) {
+      render_view_host_pending_shutdown_map_.insert(
+          std::pair<int, RenderViewHostImpl*>(site_instance->GetId(),
+                                              iter->second));
+      render_view_host_map_.erase(iter);
+      LOG(ERROR) << "FT::CreateRVHForMainFrame: rvh found and erased";
+    } else {
+      return iter->second;

[ncarter (slow), 2014/06/25 01:07:55]

(note to self) Do we need to bump the reference count of the rvh here in the
reuse case, or is that handled by the caller?

+    }
   }
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       RenderViewHostFactory::Create(site_instance,
@@ -202,7 +225,7 @@ RenderViewHostImpl* FrameTree::CreateRenderViewHostForMainFrame(
   return rvh;
 }
 
-RenderViewHostImpl* FrameTree::GetRenderViewHostForSubFrame(
+RenderViewHostImpl* FrameTree::GetRenderViewHost(
     SiteInstance* site_instance) {
   RenderViewHostMap::iterator iter =
       render_view_host_map_.find(site_instance->GetId());