PlzNavigate: Remove the RequestNavigation IPC

content/browser/loader/resource_dispatcher_host_impl.cc

Index: content/browser/loader/resource_dispatcher_host_impl.cc
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index 332b7ec84a98ee2d3eb9ef55ad006f4b1594e59f..48a8e2d4e98e1b2fb5063d2eb21374f9e3f4182d 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -1848,7 +1848,6 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
     int64 frame_tree_node_id,
     const CommonNavigationParams& params,
     const NavigationRequestInfo& info,
-    scoped_refptr<ResourceRequestBody> request_body,
     NavigationURLLoaderImplCore* loader) {
   // PlzNavigate: BeginNavigationRequest currently should only be used for the
   // browser-side navigations project.
@@ -1863,7 +1862,7 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
       // needs to be checked relative to the child that /requested/ the
       // navigation. It's where file upload checks, etc., come in.
       (delegate_ && !delegate_->ShouldBeginRequest(
-          info.navigation_params.method,
+          info.begin_params.method,
           params.url,
           resource_type,
           resource_context))) {
@@ -1881,7 +1880,7 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
   const net::URLRequestContext* request_context =
       resource_context->GetRequestContext();
 
-  int load_flags = info.navigation_params.load_flags;
+  int load_flags = info.begin_params.load_flags;
   load_flags |= net::LOAD_VERIFY_EV_CERT;
   if (info.is_main_frame) {
     load_flags |= net::LOAD_MAIN_FRAME;
@@ -1906,7 +1905,7 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
   new_request = request_context->CreateRequest(params.url, net::HIGHEST,
                                                nullptr, nullptr);
 
-  new_request->set_method(info.navigation_params.method);
+  new_request->set_method(info.begin_params.method);
   new_request->set_first_party_for_cookies(
       info.first_party_for_cookies);
   if (info.is_main_frame) {
@@ -1917,23 +1916,23 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
   SetReferrerForRequest(new_request.get(), params.referrer);
 
   net::HttpRequestHeaders headers;
-  headers.AddHeadersFromString(info.navigation_params.headers);
+  headers.AddHeadersFromString(info.begin_params.headers);
   new_request->SetExtraRequestHeaders(headers);
 
   new_request->SetLoadFlags(load_flags);
 
   // Resolve elements from request_body and prepare upload data.
-  if (info.navigation_params.request_body.get()) {
+  if (info.request_body.get()) {
     storage::BlobStorageContext* blob_context = GetBlobStorageContext(
         GetChromeBlobStorageContextForResourceContext(resource_context));
     AttachRequestBodyBlobDataHandles(
-        info.navigation_params.request_body.get(),
+        info.request_body.get(),
         blob_context);
     // TODO(davidben): The FileSystemContext is null here. In the case where
     // another renderer requested this navigation, this should be the same
     // FileSystemContext passed into ShouldServiceRequest.
     new_request->set_upload(UploadDataStreamBuilder::Build(
-        info.navigation_params.request_body.get(),
+        info.request_body.get(),
         blob_context,
         nullptr,  // file_system_context
         BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)
@@ -1965,7 +1964,7 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
           false,  // is download
           false,  // is stream
           params.allow_download,
-          info.navigation_params.has_user_gesture,
+          info.begin_params.has_user_gesture,
           true,   // enable_load_timing
           false,  // enable_upload_progress
           false,  // do_not_prompt_for_login