Revert of Do not create proxy hosts in the subtree of navigating frame.

content/browser/frame_host/frame_tree.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/frame_tree.h"
 
 #include <queue>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 34 matching lines @@
 
 // Iterate over the FrameTree to reset any node affected by the loss of the
 // given RenderViewHost's process.
 bool ResetNodesForNewProcess(RenderViewHost* render_view_host,
                              FrameTreeNode* node) {
   if (render_view_host == node->current_frame_host()->render_view_host())
     node->ResetForNewProcess();
   return true;
 }
 
-bool CreateProxyForSiteInstance(const scoped_refptr<SiteInstance>& instance,
+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.get());
   return true;
 }
 
 }  // namespace
 
 FrameTree::FrameTree(Navigator* navigator,
                      RenderFrameHostDelegate* render_frame_delegate,
                      RenderViewHostDelegate* render_view_delegate,
                      RenderWidgetHostDelegate* render_widget_delegate,
@@ skipping 49 matching lines @@
     FrameTreeNode* result = render_frame_proxy_host->frame_tree_node();
     if (this == result->frame_tree())
       return result;
   }
 
   return NULL;
 }
 
 void FrameTree::ForEach(
     const base::Callback<bool(FrameTreeNode*)>& on_node) const {
-  ForEach(on_node, NULL);
-}
-
-void FrameTree::ForEach(
-    const base::Callback<bool(FrameTreeNode*)>& on_node,
-    FrameTreeNode* skip_this_subtree) const {
   std::queue<FrameTreeNode*> queue;
   queue.push(root_.get());
 
   while (!queue.empty()) {
     FrameTreeNode* node = queue.front();
     queue.pop();
-    if (skip_this_subtree == node)
-      continue;
-
     if (!on_node.Run(node))
       break;
 
     for (size_t i = 0; i < node->child_count(); ++i)
       queue.push(node->child_at(i));
   }
 }
 
 RenderFrameHostImpl* FrameTree::AddFrame(FrameTreeNode* parent,
                                          int new_routing_id,
@@ skipping 39 matching lines @@
     if (!render_view_host) {
       root()->render_manager()->CreateRenderFrame(site_instance,
                                                   MSG_ROUTING_NONE,
                                                   true,
                                                   false,
                                                   true);
     }
   }
 
   scoped_refptr<SiteInstance> instance(site_instance);
-
-  // Proxies are created in the FrameTree in response to a node navigating to a
-  // new SiteInstance. Since |source|'s navigation will replace the currently
-  // loaded document, the entire subtree under |source| will be removed.
-  ForEach(base::Bind(&CreateProxyForSiteInstance, instance), source);
+  ForEach(base::Bind(&CreateProxyForSiteInstance, source, instance));
 }
 
 void FrameTree::ResetForMainFrameSwap() {
   root_->ResetForNewProcess();
   focused_frame_tree_node_id_ = -1;
 }
 
 void FrameTree::RenderProcessGone(RenderViewHost* render_view_host) {
   // Walk the full tree looking for nodes that may be affected.  Once a frame
   // crashes, all of its child FrameTreeNodes go away.
@@ skipping 115 matching lines @@
         rvh->Shutdown();
         render_view_host_pending_shutdown_map_.erase(multi_iter);
       }
       break;
     }
     CHECK(render_view_host_found);
   }
 }
 
 }  // namespace content