Move out DidStartProvisionalLoad from WebContentsImpl into Navigator.

content/test/test_render_view_host.cc

 // Copyright (c) 2012 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/test/test_render_view_host.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
 #include "content/browser/site_instance_impl.h"
@@ skipping 282 matching lines @@
       page_id, url, PAGE_TRANSITION_LINK, 500);
 }
 
 void TestRenderViewHost::SendNavigateWithTransition(
     int page_id, const GURL& url, PageTransition transition) {
   SendNavigateWithTransitionAndResponseCode(page_id, url, transition, 200);
 }
 
 void TestRenderViewHost::SendNavigateWithOriginalRequestURL(
     int page_id, const GURL& url, const GURL& original_request_url) {
-  OnDidStartProvisionalLoadForFrame(kFrameId, -1, true, url);
+  main_render_frame_host()->OnDidStartProvisionalLoadForFrame(
+      kFrameId, -1, true, url);
   SendNavigateWithParameters(page_id, url, PAGE_TRANSITION_LINK,
                              original_request_url, 200, 0);
 }
 
 void TestRenderViewHost::SendNavigateWithFile(
     int page_id, const GURL& url, const base::FilePath& file_path) {
   SendNavigateWithParameters(page_id, url, PAGE_TRANSITION_LINK,
                              url, 200, &file_path);
 }
 
 void TestRenderViewHost::SendNavigateWithTransitionAndResponseCode(
     int page_id, const GURL& url, PageTransition transition,
     int response_code) {
   // DidStartProvisionalLoad may delete the pending entry that holds |url|,
   // so we keep a copy of it to use in SendNavigateWithParameters.
   GURL url_copy(url);
-  OnDidStartProvisionalLoadForFrame(kFrameId, -1, true, url_copy);
+  main_render_frame_host()->OnDidStartProvisionalLoadForFrame(
+      kFrameId, -1, true, url_copy);
   SendNavigateWithParameters(page_id, url_copy, transition, url_copy,
                              response_code, 0);
 }
 
 void TestRenderViewHost::SendNavigateWithParameters(
     int page_id, const GURL& url, PageTransition transition,
     const GURL& original_request_url, int response_code,
     const base::FilePath* file_path_for_history_item) {
   ViewHostMsg_FrameNavigate_Params params;
   params.page_id = page_id;
@@ skipping 89 matching lines @@
 }
 
 TestRenderViewHost* RenderViewHostImplTestHarness::pending_test_rvh() {
   return static_cast<TestRenderViewHost*>(pending_rvh());
 }
 
 TestRenderViewHost* RenderViewHostImplTestHarness::active_test_rvh() {
   return static_cast<TestRenderViewHost*>(active_rvh());
 }
 
+TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() {
+  return static_cast<TestRenderFrameHost*>(main_rfh());
+}
+
 TestWebContents* RenderViewHostImplTestHarness::contents() {
   return static_cast<TestWebContents*>(web_contents());
 }
 
 }  // namespace content