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 223 matching lines @@
   render_view_created_ = true;
   opener_route_id_ = opener_route_id;
   return true;
 }
 
 bool TestRenderViewHost::IsRenderViewLive() const {
   return render_view_created_;
 }
 
 void TestRenderViewHost::SendNavigate(int page_id, const GURL& url) {
-  SendNavigateWithTransition(page_id, url, PAGE_TRANSITION_LINK);
+  main_render_frame_host_->SendNavigate(page_id, url);
 }
 
 void TestRenderViewHost::SendFailedNavigate(int page_id, const GURL& url) {
-  SendNavigateWithTransitionAndResponseCode(
-      page_id, url, PAGE_TRANSITION_LINK, 500);
+  main_render_frame_host_->SendFailedNavigate(page_id, url);
 }
 
 void TestRenderViewHost::SendNavigateWithTransition(
-    int page_id, const GURL& url, PageTransition transition) {
-  SendNavigateWithTransitionAndResponseCode(page_id, url, transition, 200);
+    int page_id,
+    const GURL& url,
+    PageTransition transition) {
+  main_render_frame_host_->SendNavigateWithTransition(page_id, url, transition);
 }
 
 void TestRenderViewHost::SendNavigateWithOriginalRequestURL(
-    int page_id, const GURL& url, const GURL& original_request_url) {
-  main_render_frame_host()->OnDidStartProvisionalLoadForFrame(
-      kFrameId, -1, true, url);
-  SendNavigateWithParameters(page_id, url, PAGE_TRANSITION_LINK,
-                             original_request_url, 200, 0);
+    int page_id,
+    const GURL& url,
+    const GURL& original_request_url) {
+  main_render_frame_host_->SendNavigateWithOriginalRequestURL(
+      page_id, url, original_request_url);
 }
 
 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);
+    int page_id,
+    const GURL& url,
+    const base::FilePath& file_path) {
+  main_render_frame_host_->SendNavigateWithFile(page_id, url, file_path);
 }
 
 void TestRenderViewHost::SendNavigateWithParams(
-    ViewHostMsg_FrameNavigate_Params* params) {
-  params->frame_id = kFrameId;
-  ViewHostMsg_FrameNavigate msg(1, *params);
-  OnNavigate(msg);
+    FrameHostMsg_DidCommitProvisionalLoad_Params* params) {
+  main_render_frame_host_->SendNavigateWithParams(params);
 }
 
 void TestRenderViewHost::SendNavigateWithTransitionAndResponseCode(
-    int page_id, const GURL& url, PageTransition transition,
+    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);
+  main_render_frame_host_->SendNavigateWithTransitionAndResponseCode(
+      page_id, url, transition, response_code);
 }
 
 void TestRenderViewHost::SendNavigateWithParameters(
-    int page_id, const GURL& url, PageTransition transition,
-    const GURL& original_request_url, int response_code,
+    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;
-  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,
+  main_render_frame_host_->SendNavigateWithParameters(
+      page_id, url, transition, original_request_url, response_code,
       file_path_for_history_item);
-
-  ViewHostMsg_FrameNavigate msg(1, params);
-  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;
+  main_render_frame_host_->set_contents_mime_type(mime_type);
 }
 
 void TestRenderViewHost::SimulateSwapOutACK() {
   OnSwappedOut(false);
 }
 
 void TestRenderViewHost::SimulateWasHidden() {
   WasHidden();
 }
 
@@ skipping 18 matching lines @@
                                             "data",
                                             &file_path));
 }
 
 void TestRenderViewHost::set_simulate_fetch_via_proxy(bool proxy) {
   simulate_fetch_via_proxy_ = proxy;
 }
 
 void TestRenderViewHost::set_simulate_history_list_was_cleared(bool cleared) {
   simulate_history_list_was_cleared_ = cleared;
+  main_render_frame_host_->set_simulate_history_list_was_cleared(cleared);
 }
 
 RenderViewHostImplTestHarness::RenderViewHostImplTestHarness() {
   std::vector<ui::ScaleFactor> scale_factors;
   scale_factors.push_back(ui::SCALE_FACTOR_100P);
   scoped_set_supported_scale_factors_.reset(
       new ui::test::ScopedSetSupportedScaleFactors(scale_factors));
 }
 
 RenderViewHostImplTestHarness::~RenderViewHostImplTestHarness() {
@@ skipping 13 matching lines @@
 
 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() {
   return static_cast<TestRenderFrameHost*>(main_rfh());
 }
 
 TestWebContents* RenderViewHostImplTestHarness::contents() {
   return static_cast<TestWebContents*>(web_contents());
 }
 
 }  // namespace content