Move DidCommitProvisionalLoad code from RenderView to RenderFrame.

content/test/test_web_contents.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_web_contents.h"
 
 #include <utility>
 
 #include "content/browser/browser_url_handler_impl.h"
 #include "content/browser/frame_host/cross_process_frame_connector.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
+#include "content/browser/frame_host/navigator.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/site_instance_impl.h"
+#include "content/common/frame_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/test/test_render_view_host.h"
 
 namespace content {
@@ skipping 37 matching lines @@
                               Referrer(),
                               transition);
 }
 
 void TestWebContents::TestDidNavigateWithReferrer(
     RenderViewHost* render_view_host,
     int page_id,
     const GURL& url,
     const Referrer& referrer,
     PageTransition transition) {
-  ViewHostMsg_FrameNavigate_Params params;
+  FrameHostMsg_DidCommitProvisionalLoad_Params params;
 
   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();
   params.searchable_form_encoding = std::string();
   params.security_info = std::string();
   params.gesture = NavigationGestureUser;
   params.was_within_same_page = false;
   params.is_post = false;
   params.page_state = PageState::CreateFromURL(url);
 
-  DidNavigate(render_view_host, params);
+  RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(render_view_host);
+  RenderFrameHostImpl* rfh = RenderFrameHostImpl::FromID(
+      rvh->GetProcess()->GetID(), rvh->main_frame_routing_id());
+  frame_tree_.root()->navigator()->DidNavigate(rfh, params);
 }
 
 WebPreferences TestWebContents::TestGetWebkitPrefs() {
   return GetWebkitPrefs();
 }
 
 bool TestWebContents::CreateRenderViewForRenderManager(
     RenderViewHost* render_view_host,
     int opener_route_id,
     CrossProcessFrameConnector* frame_connector) {
@@ skipping 147 matching lines @@
 }
 
 void TestWebContents::ShowCreatedWidget(int route_id,
                                         const gfx::Rect& initial_pos) {
 }
 
 void TestWebContents::ShowCreatedFullscreenWidget(int route_id) {
 }
 
 }  // namespace content