Remove page id from FrameNavigateParams.

content/test/test_render_frame_host.cc

 // Copyright 2013 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_frame_host.h"
 
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/render_frame_host_delegate.h"
 #include "content/common/frame_messages.h"
 #include "content/public/common/page_transition_types.h"
@@ skipping 91 matching lines @@
 
 void TestRenderFrameHost::SendNavigateWithFile(
     int page_id,
     const GURL& url,
     const base::FilePath& file_path) {
   SendNavigateWithParameters(page_id, url, PAGE_TRANSITION_LINK, url, 200,
       &file_path, std::vector<GURL>());
 }
 
 void TestRenderFrameHost::SendNavigateWithParams(
+    int page_id,
     FrameHostMsg_DidCommitProvisionalLoad_Params* params) {
+  OnDidAssignPageId(page_id);
   FrameHostMsg_DidCommitProvisionalLoad msg(GetRoutingID(), *params);
   OnDidCommitProvisionalLoad(msg);
 }
 
 void TestRenderFrameHost::SendNavigateWithRedirects(
     int page_id,
     const GURL& url,
     const std::vector<GURL>& redirects) {
   SendNavigateWithParameters(
       page_id, url, PAGE_TRANSITION_LINK, url, 200, 0, redirects);
 }
 
 void TestRenderFrameHost::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,
     const std::vector<GURL>& redirects) {
   FrameHostMsg_DidCommitProvisionalLoad_Params params;
-  params.page_id = page_id;
   params.url = url;
   params.referrer = Referrer();
   params.transition = transition;
   params.redirects = redirects;
   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_;
@@ skipping 10 matching lines @@
       transition != PAGE_TRANSITION_TYPED &&
       url.ReplaceComponents(replacements) ==
           GetLastCommittedURL().ReplaceComponents(replacements);
 
   params.page_state = PageState::CreateForTesting(
       url,
       false,
       file_path_for_history_item ? "data" : NULL,
       file_path_for_history_item);
 
+  OnDidAssignPageId(page_id);
   FrameHostMsg_DidCommitProvisionalLoad msg(GetRoutingID(), params);
   OnDidCommitProvisionalLoad(msg);
 }
 
 void TestRenderFrameHost::SendBeginNavigationWithURL(const GURL& url) {
   FrameHostMsg_BeginNavigation_Params params;
   params.method = "GET";
   params.url = url;
   params.referrer = Referrer(GURL(), blink::WebReferrerPolicyDefault);
   params.load_flags = net::LOAD_NORMAL;
   params.has_user_gesture = false;
   params.transition_type = PAGE_TRANSITION_LINK;
   params.should_replace_current_entry = false;
   params.allow_download = true;
   OnBeginNavigation(params);
 }
 
 void TestRenderFrameHost::DidDisownOpener() {
   OnDidDisownOpener();
 }
 
 }  // namespace content