Move out DidStartProvisionalLoad from WebContentsImpl into Navigator.

content/browser/frame_host/render_frame_host_impl.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/render_frame_host_impl.h"
 
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "content/browser/frame_host/frame_tree.h"
+#include "content/browser/frame_host/navigator.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"
 #include "url/gurl.h"
 
 namespace content {
 
 // The (process id, routing id) pair that identifies one RenderFrame.
 typedef std::pair<int32, int32> RenderFrameHostID;
 typedef base::hash_map<RenderFrameHostID, RenderFrameHostImpl*>
     RoutingIDFrameMap;
 static base::LazyInstance<RoutingIDFrameMap> g_routing_id_frame_map =
     LAZY_INSTANCE_INITIALIZER;
 
 // static
 RenderFrameHostImpl* RenderFrameHostImpl::FromID(
     int process_id, int routing_id) {
   RoutingIDFrameMap* frames = g_routing_id_frame_map.Pointer();
   RoutingIDFrameMap::iterator it = frames->find(
       RenderFrameHostID(process_id, routing_id));
   return it == frames->end() ? NULL : it->second;
 }
 
 RenderFrameHostImpl::RenderFrameHostImpl(
     RenderViewHostImpl* render_view_host,
     FrameTree* frame_tree,
+    Navigator* navigator,
     int routing_id,
     bool is_swapped_out)
     : render_view_host_(render_view_host),
       frame_tree_(frame_tree),
+      navigator_(navigator),
       routing_id_(routing_id),
       is_swapped_out_(is_swapped_out) {
   GetProcess()->AddRoute(routing_id_, this);
   g_routing_id_frame_map.Get().insert(std::make_pair(
       RenderFrameHostID(GetProcess()->GetID(), routing_id_),
       this));
 }
 
 RenderFrameHostImpl::~RenderFrameHostImpl() {
   GetProcess()->RemoveRoute(routing_id_);
@@ skipping 21 matching lines @@
 void RenderFrameHostImpl::Init() {
   GetProcess()->ResumeRequestsForView(routing_id());
 }
 
 RenderProcessHost* RenderFrameHostImpl::GetProcess() const {
   // TODO(nasko): This should return its own process, once we have working
   // cross-process navigation for subframes.
   return render_view_host_->GetProcess();
 }
 
+SiteInstance* RenderFrameHostImpl::GetSiteInstance() const {
+  // TODO(nasko): This should return the RenderFrameHostImpl's SiteInstance,
+  // but it is not implemented yet, so return the one for the associated
+  // RenderViewHost.
+  return render_view_host_->GetSiteInstance();
+}
+
 void RenderFrameHostImpl::OnCreateChildFrame(int new_frame_routing_id,
                                              int64 parent_frame_id,
                                              int64 frame_id,
                                              const std::string& frame_name) {
   frame_tree_->AddFrame(new_frame_routing_id, parent_frame_id, frame_id,
                         frame_name);
 }
 
 void RenderFrameHostImpl::OnDetach(int64 parent_frame_id, int64 frame_id) {
   frame_tree_->RemoveFrame(parent_frame_id, frame_id);
 }
 
 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame(
     int64 frame_id,
     int64 parent_frame_id,
     bool is_main_frame,
     const GURL& url) {
-  render_view_host_->OnDidStartProvisionalLoadForFrame(
-      frame_id, parent_frame_id, is_main_frame, url);
+  navigator_->DidStartProvisionalLoad(
+      this, frame_id, parent_frame_id, is_main_frame, url);
 }
 
 }  // namespace content