Remove page id from FrameNavigateParams.

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/public/common/web_preferences.h"
 #include "content/test/test_render_frame_host.h"
 #include "content/test/test_web_contents.h"
 #include "media/base/video_frame.h"
 #include "ui/gfx/rect.h"
 
 namespace content {
 
 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();
   params->searchable_form_encoding = std::string();
   params->security_info = std::string();
   params->gesture = NavigationGestureUser;
   params->was_within_same_page = false;
@@ skipping 243 matching lines @@
 }
 
 void TestRenderViewHost::SendNavigateWithFile(
     int page_id,
     const GURL& url,
     const base::FilePath& file_path) {
   main_render_frame_host_->SendNavigateWithFile(page_id, url, file_path);
 }
 
 void TestRenderViewHost::SendNavigateWithParams(
+    int page_id,
     FrameHostMsg_DidCommitProvisionalLoad_Params* params) {
-  main_render_frame_host_->SendNavigateWithParams(params);
+  main_render_frame_host_->SendNavigateWithParams(page_id, params);
 }
 
 void TestRenderViewHost::SendNavigateWithTransitionAndResponseCode(
     int page_id,
     const GURL& url,
     PageTransition transition,
     int response_code) {
   main_render_frame_host_->SendNavigateWithTransitionAndResponseCode(
       page_id, url, transition, response_code);
 }
@@ skipping 87 matching lines @@
 
 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() {
   return contents()->GetMainFrame();
 }
 
 TestWebContents* RenderViewHostImplTestHarness::contents() {
   return static_cast<TestWebContents*>(web_contents());
 }
 
 }  // namespace content