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 37 matching lines @@
                      RenderWidgetHostDelegate* render_widget_delegate,
                      RenderViewHostManager::Delegate* manager_delegate)
     : render_view_delegate_(render_view_delegate),
       render_widget_delegate_(render_widget_delegate),
       manager_delegate_(manager_delegate),
       root_(new FrameTreeNode(navigator,
                               render_view_delegate,
                               render_widget_delegate,
                               manager_delegate,
                               FrameTreeNode::kInvalidFrameId,
-                              std::string(),
-                              scoped_ptr<RenderFrameHostImpl>())) {
+                              std::string())) {
+  root_->set_render_frame_host(scoped_ptr<RenderFrameHostImpl>());

[Charlie Reis, 2013/11/21 21:59:32]

I'm not entirely clear why this is needed.  It doesn't seem related to this CL,
and I haven't found anything that depends on it so far.

[nasko, 2013/11/22 01:02:34]

This is incorrect here, disregard.

 }
 
 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 89 matching lines @@
   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) {
+  scoped_ptr<FrameTreeNode> frame_tree_node(new FrameTreeNode(navigator,
+      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(),
-          this,
-          render_frame_host_id,
-          false));
+          this, frame_tree_node.get(), render_frame_host_id, false));
 
-  return make_scoped_ptr(new FrameTreeNode(navigator,
-      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.Pass());
+  return frame_tree_node.Pass();
 }
 
 }  // namespace content