Move out DidStartProvisionalLoad from WebContentsImpl into Navigator.

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 40 matching lines @@
     : render_frame_delegate_(render_frame_delegate),
       render_view_delegate_(render_view_delegate),
       render_widget_delegate_(render_widget_delegate),
       manager_delegate_(manager_delegate),
       root_(new FrameTreeNode(navigator,
                               render_frame_delegate,
                               render_view_delegate,
                               render_widget_delegate,
                               manager_delegate,
                               FrameTreeNode::kInvalidFrameId,
-                              std::string(),
-                              scoped_ptr<RenderFrameHostImpl>())) {
+                              std::string())) {
 }
 
 FrameTree::~FrameTree() {
 }
 
 FrameTreeNode* FrameTree::FindByID(int64 frame_tree_node_id) {
   FrameTreeNode* node = NULL;
   ForEach(base::Bind(&FrameTreeNodeForId, frame_tree_node_id, &node));
   return node;
 }
@@ skipping 25 matching lines @@
 void FrameTree::AddFrame(int render_frame_host_id,
                          int64 parent_frame_id,
                          int64 frame_id,
                          const std::string& frame_name) {
   FrameTreeNode* parent = FindByFrameID(parent_frame_id);
   // TODO(ajwong): Should the renderer be killed here? Would there be a race on
   // shutdown that might make this case possible?
   if (!parent)
     return;
 
-  parent->AddChild(CreateNode(frame_id, frame_name, render_frame_host_id,
-                              parent->navigator(),
-                              parent->render_frame_host()->GetProcess()));
+  parent->AddChild(
+      CreateNode(frame_id, frame_name, render_frame_host_id, parent));
 }
 
-void FrameTree::RemoveFrame(int64 parent_frame_id, int64 frame_id) {
+void FrameTree::RemoveFrame(RenderFrameHostImpl* render_frame_host,
+                            int64 parent_frame_id,
+                            int64 frame_id) {
   // If switches::kSitePerProcess is not specified, then the FrameTree only
   // contains a node for the root element. However, even in this case
   // frame detachments need to be broadcast outwards.
   //
   // TODO(ajwong): Move this below the |parent| check after the FrameTree is
   // guaranteed to be correctly populated even without the
   // switches::kSitePerProcess flag.
   FrameTreeNode* parent = FindByFrameID(parent_frame_id);
   FrameTreeNode* child = FindByFrameID(frame_id);
   if (!on_frame_removed_.is_null()) {
     on_frame_removed_.Run(
-        root_->render_frame_host()->render_view_host(), frame_id);
+        render_frame_host->render_view_host(), frame_id);
   }
 
   // TODO(ajwong): Should the renderer be killed here? Would there be a race on
   // shutdown that might make this case possible?
   if (!parent || !child)
     return;
 
   parent->RemoveChild(child);
 }
 
@@ skipping 24 matching lines @@
 FrameTreeNode* FrameTree::FindByFrameID(int64 frame_id) {
   FrameTreeNode* node = NULL;
   ForEach(base::Bind(&FrameTreeNodeForFrameId, frame_id, &node));
   return node;
 }
 
 scoped_ptr<FrameTreeNode> FrameTree::CreateNode(
     int64 frame_id,
     const std::string& frame_name,
     int render_frame_host_id,
-    Navigator* navigator,
-    RenderProcessHost* render_process_host) {
+    FrameTreeNode* parent_node) {
+  scoped_ptr<FrameTreeNode> frame_tree_node(new FrameTreeNode(
+      parent_node->navigator(), render_frame_delegate_, render_view_delegate_,
+      render_widget_delegate_, manager_delegate_, frame_id, frame_name));
+
   scoped_ptr<RenderFrameHostImpl> render_frame_host(
       RenderFrameHostFactory::Create(
-          root_->render_frame_host()->render_view_host(),
-          root_->render_frame_host()->delegate(),
+          parent_node->render_frame_host()->render_view_host(),
+          parent_node->render_frame_host()->delegate(),
           this,
+          frame_tree_node.get(),
           render_frame_host_id,
           false));
 
-  return make_scoped_ptr(new FrameTreeNode(navigator,
-      render_frame_delegate_, render_view_delegate_, render_widget_delegate_,
-      manager_delegate_, frame_id, frame_name, render_frame_host.Pass()));
+  frame_tree_node->set_render_frame_host(render_frame_host.release(), true);
+  return frame_tree_node.Pass();
 }
 
 }  // namespace content