Move DidCommitProvisionalLoad code from RenderView to RenderFrame.

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"
 #include "content/common/dom_storage/dom_storage_types.h"
+#include "content/common/frame_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/page_state.h"
 #include "content/test/test_backing_store.h"
 #include "content/test/test_web_contents.h"
 #include "media/base/video_frame.h"
 #include "ui/gfx/rect.h"
 #include "webkit/common/webpreferences.h"
 
 namespace content {
 
 namespace {
 
 const int64 kFrameId = 13UL;
 
 }  // namespace
 
 
-void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params,
+void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params,
                         int page_id,
                         const GURL& url,
                         PageTransition transition) {
   params->page_id = page_id;
   params->url = url;
   params->referrer = Referrer();
   params->transition = transition;
   params->redirects = std::vector<GURL>();
   params->should_update_history = false;
   params->searchable_form_url = GURL();
@@ skipping 251 matching lines @@
                              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::SendNavigateWithParams(
-    ViewHostMsg_FrameNavigate_Params* params) {
+    FrameHostMsg_DidCommitProvisionalLoad_Params* params) {
   params->frame_id = kFrameId;
-  ViewHostMsg_FrameNavigate msg(1, *params);
-  OnNavigate(msg);
+  FrameHostMsg_DidCommitProvisionalLoad msg(1, *params);
+  main_render_frame_host()->OnNavigate(msg);
 }
 
 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);
   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;
+  FrameHostMsg_DidCommitProvisionalLoad_Params params;
   params.page_id = page_id;
   params.frame_id = kFrameId;
   params.url = url;
   params.referrer = Referrer();
   params.transition = transition;
   params.redirects = std::vector<GURL>();
   params.should_update_history = true;
   params.searchable_form_url = GURL();
   params.searchable_form_encoding = std::string();
   params.security_info = std::string();
   params.gesture = NavigationGestureUser;
   params.contents_mime_type = contents_mime_type_;
   params.is_post = false;
   params.was_within_same_page = false;
   params.http_status_code = response_code;
   params.socket_address.set_host("2001:db8::1");
   params.socket_address.set_port(80);
   params.was_fetched_via_proxy = simulate_fetch_via_proxy_;
   params.history_list_was_cleared = simulate_history_list_was_cleared_;
   params.original_request_url = original_request_url;
 
   params.page_state = PageState::CreateForTesting(
       url,
       false,
       file_path_for_history_item ? "data" : NULL,
       file_path_for_history_item);
 
-  ViewHostMsg_FrameNavigate msg(1, params);
-  OnNavigate(msg);
+  FrameHostMsg_DidCommitProvisionalLoad msg(1, params);
+  main_render_frame_host()->OnNavigate(msg);
 }
 
 void TestRenderViewHost::SendShouldCloseACK(bool proceed) {
   base::TimeTicks now = base::TimeTicks::Now();
   OnShouldCloseACK(proceed, now, now);
 }
 
 void TestRenderViewHost::SetContentsMimeType(const std::string& mime_type) {
   contents_mime_type_ = mime_type;
 }
@@ skipping 60 matching lines @@
 
 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() {
   return static_cast<TestRenderFrameHost*>(main_rfh());
 }
 
 TestWebContents* RenderViewHostImplTestHarness::contents() {
   return static_cast<TestWebContents*>(web_contents());
 }
 
 }  // namespace content