Move out DidStartProvisionalLoad from WebContentsImpl into Navigator.

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index e41fc0165a45dbcb8c55144445c9f27118eb04cc..6dfb56243723eb942543239f643fb5a1233b2b11 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -7,11 +7,14 @@
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "content/browser/frame_host/frame_tree.h"
+#include "content/browser/frame_host/frame_tree_node.h"
+#include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/render_frame_host_delegate.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/common/frame_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
+#include "content/public/browser/site_instance.h"

[Charlie Reis, 2013/12/10 01:20:51]

No longer needed?

[nasko, 2013/12/10 01:36:50]

Done.

 #include "content/public/browser/user_metrics.h"
 #include "url/gurl.h"
 
@@ -37,11 +40,13 @@ RenderFrameHostImpl::RenderFrameHostImpl(
     RenderViewHostImpl* render_view_host,
     RenderFrameHostDelegate* delegate,
     FrameTree* frame_tree,
+    FrameTreeNode* frame_tree_node,
     int routing_id,
     bool is_swapped_out)
     : render_view_host_(render_view_host),
       delegate_(delegate),
       frame_tree_(frame_tree),
+      frame_tree_node_(frame_tree_node),
       routing_id_(routing_id),
       is_swapped_out_(is_swapped_out) {
   GetProcess()->AddRoute(routing_id_, this);
@@ -106,7 +111,7 @@ void RenderFrameHostImpl::OnCreateChildFrame(int new_frame_routing_id,
 }
 
 void RenderFrameHostImpl::OnDetach(int64 parent_frame_id, int64 frame_id) {
-  frame_tree_->RemoveFrame(parent_frame_id, frame_id);
+  frame_tree_->RemoveFrame(this, parent_frame_id, frame_id);
 }
 
 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame(
@@ -114,8 +119,8 @@ void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame(
     int64 parent_frame_id,
     bool is_main_frame,
     const GURL& url) {
-  render_view_host_->OnDidStartProvisionalLoadForFrame(
-      frame_id, parent_frame_id, is_main_frame, url);
+  frame_tree_node_->navigator()->DidStartProvisionalLoad(
+      this, frame_id, parent_frame_id, is_main_frame, url);
 }
 
 }  // namespace content