| 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 8cae9a5c93bc3a0b6824558674256f30a5b2fe1b..3b227ea97bbe6e715d1e32dd99960e3b6f749076 100644
|
| --- a/content/browser/loader/resource_request_info_impl.cc
|
| +++ b/content/browser/loader/resource_request_info_impl.cc
|
| @@ -29,7 +29,17 @@ void ResourceRequestInfo::AllocateForTesting(net::URLRequest* request,
|
| int render_process_id,
|
| int render_view_id,
|
| int render_frame_id,
|
| + bool is_main_frame,
|
| + bool parent_is_main_frame,
|
| bool is_async) {
|
| + // Make sure both |is_main_frame| and |parent_is_main_frame| aren't set at the
|
| + // same time.
|
| + DCHECK(!(is_main_frame && parent_is_main_frame));
|
| +
|
| + // Make sure RESOURCE_TYPE_MAIN_FRAME is declared as being fetched as part of
|
| + // the main frame.
|
| + DCHECK(resource_type != RESOURCE_TYPE_MAIN_FRAME || is_main_frame);
|
| +
|
| ResourceRequestInfoImpl* info =
|
| new ResourceRequestInfoImpl(
|
| PROCESS_TYPE_RENDERER, // process_type
|
| @@ -38,8 +48,8 @@ void ResourceRequestInfo::AllocateForTesting(net::URLRequest* request,
|
| 0, // origin_pid
|
| 0, // request_id
|
| render_frame_id, // render_frame_id
|
| - resource_type == RESOURCE_TYPE_MAIN_FRAME, // is_main_frame
|
| - false, // parent_is_main_frame
|
| + 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
|
|
|