Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(380)

Unified Diff: content/browser/loader/resource_request_info_impl.cc

Issue 1079163008: PlzNavigate: provide the FrameTreeNode ID to the network stack (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix-unittests
Patch Set: Addressed David's comments Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/loader/resource_request_info_impl.cc
diff --git a/content/browser/loader/resource_request_info_impl.cc b/content/browser/loader/resource_request_info_impl.cc
index be8ffa0ead4395e41906ad70e172b029d5f8f10d..515c7d6247fa3d830f792da66fb5b012606c16a3 100644
--- a/content/browser/loader/resource_request_info_impl.cc
+++ b/content/browser/loader/resource_request_info_impl.cc
@@ -41,32 +41,32 @@ void ResourceRequestInfo::AllocateForTesting(net::URLRequest* request,
// the main frame.
DCHECK(resource_type != RESOURCE_TYPE_MAIN_FRAME || is_main_frame);
- ResourceRequestInfoImpl* info =
- new ResourceRequestInfoImpl(
- PROCESS_TYPE_RENDERER, // process_type
- render_process_id, // child_id
- render_view_id, // route_id
- 0, // origin_pid
- 0, // request_id
- render_frame_id, // render_frame_id
- is_main_frame, // is_main_frame
- parent_is_main_frame, // parent_is_main_frame
- 0, // parent_render_frame_id
- resource_type, // resource_type
- ui::PAGE_TRANSITION_LINK, // transition_type
- false, // should_replace_current_entry
- false, // is_download
- false, // is_stream
- allow_download, // allow_download
- false, // has_user_gesture
- false, // enable load timing
- false, // enable upload progress
- false, // do_not_prompt_for_login
- blink::WebReferrerPolicyDefault, // referrer_policy
- blink::WebPageVisibilityStateVisible, // visibility_state
- context, // context
- base::WeakPtr<ResourceMessageFilter>(), // filter
- is_async); // is_async
+ ResourceRequestInfoImpl* info = new ResourceRequestInfoImpl(
+ PROCESS_TYPE_RENDERER, // process_type
+ render_process_id, // child_id
+ render_view_id, // route_id
+ -1, // frame_tree_node_id
+ 0, // origin_pid
+ 0, // request_id
+ render_frame_id, // render_frame_id
+ is_main_frame, // is_main_frame
+ parent_is_main_frame, // parent_is_main_frame
+ 0, // parent_render_frame_id
+ resource_type, // resource_type
+ ui::PAGE_TRANSITION_LINK, // transition_type
+ false, // should_replace_current_entry
+ false, // is_download
+ false, // is_stream
+ allow_download, // allow_download
+ false, // has_user_gesture
+ false, // enable load timing
+ false, // enable upload progress
+ false, // do_not_prompt_for_login
+ blink::WebReferrerPolicyDefault, // referrer_policy
+ blink::WebPageVisibilityStateVisible, // visibility_state
+ context, // context
+ base::WeakPtr<ResourceMessageFilter>(), // filter
+ is_async); // is_async
info->AssociateWithRequest(request);
}
@@ -103,6 +103,7 @@ ResourceRequestInfoImpl::ResourceRequestInfoImpl(
int process_type,
int child_id,
int route_id,
+ int64 frame_tree_node_id,
int origin_pid,
int request_id,
int render_frame_id,
@@ -129,6 +130,7 @@ ResourceRequestInfoImpl::ResourceRequestInfoImpl(
process_type_(process_type),
child_id_(child_id),
route_id_(route_id),
+ frame_tree_node_id_(frame_tree_node_id),
origin_pid_(origin_pid),
request_id_(request_id),
render_frame_id_(render_frame_id),

Powered by Google App Engine
This is Rietveld 408576698