| 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 29092f2f42fb58e037377acbf6181fdca5692685..454c2debac17f019fba7a653380d90d4c3c65f24 100644
|
| --- a/content/browser/loader/resource_dispatcher_host_impl.cc
|
| +++ b/content/browser/loader/resource_dispatcher_host_impl.cc
|
| @@ -1798,17 +1798,12 @@ ResourceRequestInfoImpl* ResourceDispatcherHostImpl::CreateRequestInfo(
|
| bool download,
|
| ResourceContext* context) {
|
| return new ResourceRequestInfoImpl(
|
| - PROCESS_TYPE_RENDERER,
|
| - child_id,
|
| - render_view_route_id,
|
| + PROCESS_TYPE_RENDERER, child_id, render_view_route_id,
|
| -1, // frame_tree_node_id
|
| - 0,
|
| - request_id_,
|
| - render_frame_route_id,
|
| - false, // is_main_frame
|
| - false, // parent_is_main_frame
|
| - RESOURCE_TYPE_SUB_RESOURCE,
|
| - ui::PAGE_TRANSITION_LINK,
|
| + 0, MakeRequestID(), render_frame_route_id,
|
| + false, // is_main_frame
|
| + false, // parent_is_main_frame
|
| + RESOURCE_TYPE_SUB_RESOURCE, ui::PAGE_TRANSITION_LINK,
|
| false, // should_replace_current_entry
|
| download, // is_download
|
| false, // is_stream
|
| @@ -1817,8 +1812,7 @@ ResourceRequestInfoImpl* ResourceDispatcherHostImpl::CreateRequestInfo(
|
| false, // enable_load_timing
|
| false, // enable_upload_progress
|
| false, // do_not_prompt_for_login
|
| - blink::WebReferrerPolicyDefault,
|
| - blink::WebPageVisibilityStateVisible,
|
| + blink::WebReferrerPolicyDefault, blink::WebPageVisibilityStateVisible,
|
| context,
|
| base::WeakPtr<ResourceMessageFilter>(), // filter
|
| false, // report_raw_headers
|
| @@ -2147,8 +2141,6 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
|
| BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE).get()));
|
| }
|
|
|
| - request_id_--;
|
| -
|
| // Make extra info and read footer (contains request ID).
|
| //
|
| // TODO(davidben): Associate the request with the FrameTreeNode and/or tab so
|
| @@ -2159,7 +2151,7 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
|
| -1, // route_id
|
| info.frame_tree_node_id,
|
| -1, // request_data.origin_pid,
|
| - request_id_,
|
| + MakeRequestID(),
|
| -1, // request_data.render_frame_id,
|
| info.is_main_frame, info.parent_is_main_frame, resource_type,
|
| info.common_params.transition,
|
| @@ -2349,8 +2341,6 @@ void ResourceDispatcherHostImpl::InitializeURLRequest(
|
|
|
| SetReferrerForRequest(request, referrer);
|
|
|
| - request_id_--;
|
| -
|
| ResourceRequestInfoImpl* info =
|
| CreateRequestInfo(render_process_host_id, render_view_routing_id,
|
| render_frame_routing_id, is_download, context);
|
|
|