Add is_main_frame and parent_is_main_frame to ResourceRequestInfo::AllocateForTesting.

content/browser/loader/resource_request_info_impl.cc

 // Copyright (c) 2012 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/browser/loader/resource_request_info_impl.h"
 
 #include "content/browser/loader/global_routing_id.h"
 #include "content/browser/loader/resource_message_filter.h"
 #include "content/common/net/url_request_user_data.h"
 #include "content/public/browser/global_request_id.h"
@@ skipping 11 matching lines @@
   return ResourceRequestInfoImpl::ForRequest(request);
 }
 
 // static
 void ResourceRequestInfo::AllocateForTesting(net::URLRequest* request,
                                              ResourceType resource_type,
                                              ResourceContext* context,
                                              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);

[mmenke, 2014/11/12 21:17:49]

Hrm...Is there any case where resource_type == RESOURCE_TYPE_MAIN_FRAME &&
!is_main_frame?

If not, this should be DCHECK_EQ(is_main_frame, resource_type ==
RESOURCE_TYPE_MAIN_FRAME);

Or could just get rid of is_main_frame, and keep parent_is_main_frame.

Actually, if that's the case, should probably get rid of
ResourceRequestImpl::is_main_frame_ completely, in favor of using the comparison
everywhere, but that's a bit beyond the scope of this CL.

[gab, 2014/11/12 21:19:14]

Yes, every resource loaded as part of the main frame has |is_main_frame ==
true|.

+
   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
-          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
           false,                             // should_replace_current_entry
           false,                             // is_download
           false,                             // is_stream
           true,                              // allow_download
           false,                             // has_user_gesture
           false,                             // enable load timing
           false,                             // enable upload progress
@@ skipping 205 matching lines @@
     base::WeakPtr<ResourceMessageFilter> filter) {
   child_id_ = child_id;
   route_id_ = route_id;
   origin_pid_ = origin_pid;
   request_id_ = request_id;
   parent_render_frame_id_ = parent_render_frame_id;
   filter_ = filter;
 }
 
 }  // namespace content