Add is_main_frame and parent_is_main_frame to ResourceRequestInfo::AllocateForTesting.

These are required in https://codereview.chromium.org/516663002/

BUG=412468
TBR=kmadhusu, mkosiba

Review URL: https://codereview.chromium.org/624073002

Cr-Commit-Position: refs/heads/master@{#304034}

10 files changed, 97 insertions, 54 deletions

diff --git a/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
index 96279af..e2e0c34 100644
--- a/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
@@ -136,7 +136,9 @@ TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) {
                                             process_id,
                                             view_id,
                                             MSG_ROUTING_NONE,
-                                            false);
+                                            false,   // is_main_frame
+                                            false,   // parent_is_main_frame
+                                            false);  // is_async
     extension_info_map_->RegisterExtensionProcess(
         extensions::kWebStoreAppId, process_id, site_instance_id);
     EXPECT_TRUE(WebRequestPermissions::HideRequest(
@@ -154,7 +156,9 @@ TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) {
                                             process_id,
                                             view_id,
                                             MSG_ROUTING_NONE,
-                                            false);
+                                            false,   // is_main_frame
+                                            false,   // parent_is_main_frame
+                                            false);  // is_async
     EXPECT_TRUE(WebRequestPermissions::HideRequest(
         extension_info_map_.get(), sensitive_request.get()));
   }
diff --git a/chrome/browser/extensions/extension_protocols_unittest.cc b/chrome/browser/extensions/extension_protocols_unittest.cc
index 118bb34..61bfba0 100644
--- a/chrome/browser/extensions/extension_protocols_unittest.cc
+++ b/chrome/browser/extensions/extension_protocols_unittest.cc
@@ -127,13 +127,16 @@ class ExtensionProtocolTest : public testing::Test {
 
   void StartRequest(net::URLRequest* request,
                     ResourceType resource_type) {
-    content::ResourceRequestInfo::AllocateForTesting(request,
-                                                     resource_type,
-                                                     &resource_context_,
-                                                     -1,
-                                                     -1,
-                                                     -1,
-                                                     false);
+    content::ResourceRequestInfo::AllocateForTesting(
+        request,
+        resource_type,
+        &resource_context_,
+        -1,      // render_process_id
+        -1,      // render_view_id
+        -1,      // render_frame_id
+        resource_type == content::RESOURCE_TYPE_MAIN_FRAME,  // is_main_frame
+        false,   // parent_is_main_frame
+        false);  // is_async
     request->Start();
     base::MessageLoop::current()->Run();
   }
diff --git a/chrome/browser/prerender/prerender_tracker_unittest.cc b/chrome/browser/prerender/prerender_tracker_unittest.cc
index d7eed1d..1808ca0 100644
--- a/chrome/browser/prerender/prerender_tracker_unittest.cc
+++ b/chrome/browser/prerender/prerender_tracker_unittest.cc
@@ -226,13 +226,16 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectResume) {
       net::DEFAULT_PRIORITY,
       &delegate,
       NULL));
-  content::ResourceRequestInfo::AllocateForTesting(request.get(),
-                                                   content::RESOURCE_TYPE_IMAGE,
-                                                   NULL,
-                                                   kDefaultChildId,
-                                                   kDefaultRouteId,
-                                                   MSG_ROUTING_NONE,
-                                                   true);
+  content::ResourceRequestInfo::AllocateForTesting(
+      request.get(),
+      content::RESOURCE_TYPE_IMAGE,
+      NULL,
+      kDefaultChildId,
+      kDefaultRouteId,
+      MSG_ROUTING_NONE,
+      false,  // is_main_frame
+      false,  // parent_is_main_frame
+      true);  // is_async
 
   // Install a prerender throttle.
   PrerenderResourceThrottle throttle(request.get());
@@ -276,7 +279,9 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectMainFrame) {
       kDefaultChildId,
       kDefaultRouteId,
       MSG_ROUTING_NONE,
-      true);
+      true,   // is_main_frame
+      false,  // parent_is_main_frame
+      true);  // is_async
 
   // Install a prerender throttle.
   PrerenderResourceThrottle throttle(request.get());
@@ -311,13 +316,16 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectSyncXHR) {
       net::DEFAULT_PRIORITY,
       &delegate,
       NULL));
-  content::ResourceRequestInfo::AllocateForTesting(request.get(),
-                                                   content::RESOURCE_TYPE_XHR,
-                                                   NULL,
-                                                   kDefaultChildId,
-                                                   kDefaultRouteId,
-                                                   MSG_ROUTING_NONE,
-                                                   false);
+  content::ResourceRequestInfo::AllocateForTesting(
+      request.get(),
+      content::RESOURCE_TYPE_XHR,
+      NULL,
+      kDefaultChildId,
+      kDefaultRouteId,
+      MSG_ROUTING_NONE,
+      false,   // is_main_frame
+      false,   // parent_is_main_frame
+      false);  // is_async
 
   // Install a prerender throttle.
   PrerenderResourceThrottle throttle(request.get());
diff --git a/chrome/browser/search/iframe_source_unittest.cc b/chrome/browser/search/iframe_source_unittest.cc
index 728de4c..678b249 100644
--- a/chrome/browser/search/iframe_source_unittest.cc
+++ b/chrome/browser/search/iframe_source_unittest.cc
@@ -108,7 +108,9 @@ class IframeSourceTest : public testing::Test {
           render_process_id,
           render_frame_id,
           MSG_ROUTING_NONE,
-          false);
+          false,   // is_main_frame
+          false,   // parent_is_main_frame
+          false);  // is_async
     }
     return request.Pass();
   }
diff --git a/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc b/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc
index 801efe4..ffc2c87 100644
--- a/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc
+++ b/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc
@@ -129,7 +129,9 @@ class TestIOThreadState {
           render_process_id,
           MSG_ROUTING_NONE,
           render_frame_id,
-          false);
+          true,    // is_main_frame
+          false,   // parent_is_main_frame
+          false);  // is_async
     }
     throttle_.reset(new InterceptNavigationResourceThrottle(
         request_.get(),
diff --git a/content/browser/loader/resource_loader_unittest.cc b/content/browser/loader/resource_loader_unittest.cc
index 635f566..fce1187 100644
--- a/content/browser/loader/resource_loader_unittest.cc
+++ b/content/browser/loader/resource_loader_unittest.cc
@@ -323,7 +323,9 @@ class ResourceLoaderTest : public testing::Test,
                                             kRenderProcessId,
                                             kRenderViewId,
                                             MSG_ROUTING_NONE,
-                                            false);
+                                            true,    // is_main_frame
+                                            false,   // parent_is_main_frame
+                                            false);  // is_async
     scoped_ptr<ResourceHandlerStub> resource_handler(
         new ResourceHandlerStub(request.get()));
     raw_ptr_resource_handler_ = resource_handler.get();
diff --git a/content/browser/loader/resource_request_info_impl.cc b/content/browser/loader/resource_request_info_impl.cc
index 8cae9a5..3b227ea 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
diff --git a/content/public/browser/resource_request_info.h b/content/public/browser/resource_request_info.h
index 00be9c7..53a36d7 100644
--- a/content/public/browser/resource_request_info.h
+++ b/content/public/browser/resource_request_info.h
@@ -36,6 +36,8 @@ class ResourceRequestInfo {
                                                 int render_process_id,
                                                 int render_view_id,
                                                 int render_frame_id,
+                                                bool is_main_frame,
+                                                bool parent_is_main_frame,
                                                 bool is_async);
 
   // Returns the associated RenderFrame for a given process. Returns false, if
diff --git a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
index e24c3a9..def29dc 100644
--- a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
+++ b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
@@ -102,11 +102,13 @@ TEST(WebRequestConditionAttributeTest, ResourceType) {
   content::ResourceRequestInfo::AllocateForTesting(
       url_request_ok.get(),
       content::RESOURCE_TYPE_SUB_FRAME,
-      NULL,
-      -1,
-      -1,
-      -1,
-      false);
+      NULL,    // context
+      -1,      // render_process_id
+      -1,      // render_view_id
+      -1,      // render_frame_id
+      false,   // is_main_frame
+      false,   // parent_is_main_frame
+      false);  // is_async
   EXPECT_TRUE(attribute->IsFulfilled(WebRequestData(url_request_ok.get(),
                                                     ON_BEFORE_REQUEST)));
 
@@ -115,11 +117,13 @@ TEST(WebRequestConditionAttributeTest, ResourceType) {
   content::ResourceRequestInfo::AllocateForTesting(
       url_request_fail.get(),
       content::RESOURCE_TYPE_MAIN_FRAME,
-      NULL,
-      -1,
-      -1,
-      -1,
-      false);
+      NULL,    // context
+      -1,      // render_process_id
+      -1,      // render_view_id
+      -1,      // render_frame_id
+      true,    // is_main_frame
+      false,   // parent_is_main_frame
+      false);  // is_async
   EXPECT_FALSE(attribute->IsFulfilled(WebRequestData(url_request_fail.get(),
                                                      ON_BEFORE_REQUEST)));
 }
diff --git a/extensions/browser/api/declarative_webrequest/webrequest_condition_unittest.cc b/extensions/browser/api/declarative_webrequest/webrequest_condition_unittest.cc
index 64a9bc8..12d14bd 100644
--- a/extensions/browser/api/declarative_webrequest/webrequest_condition_unittest.cc
+++ b/extensions/browser/api/declarative_webrequest/webrequest_condition_unittest.cc
@@ -89,11 +89,13 @@ TEST(WebRequestConditionTest, CreateCondition) {
   content::ResourceRequestInfo::AllocateForTesting(
       match_request.get(),
       content::RESOURCE_TYPE_MAIN_FRAME,
-      NULL,
-      -1,
-      -1,
-      -1,
-      false);
+      NULL,    // context
+      -1,      // render_process_id
+      -1,      // render_view_id
+      -1,      // render_frame_id
+      true,    // is_main_frame
+      false,   // parent_is_main_frame
+      false);  // is_async
   EXPECT_TRUE(result->IsFulfilled(request_data));
 
   const GURL https_url("https://www.example.com");
@@ -106,11 +108,13 @@ TEST(WebRequestConditionTest, CreateCondition) {
   content::ResourceRequestInfo::AllocateForTesting(
       wrong_resource_type.get(),
       content::RESOURCE_TYPE_SUB_FRAME,
-      NULL,
-      -1,
-      -1,
-      -1,
-      false);
+      NULL,    // context
+      -1,      // render_process_id
+      -1,      // render_view_id
+      -1,      // render_frame_id
+      false,   // is_main_frame
+      false,   // parent_is_main_frame
+      false);  // is_async
   EXPECT_FALSE(result->IsFulfilled(request_data));
 }
 
@@ -152,11 +156,13 @@ TEST(WebRequestConditionTest, CreateConditionFirstPartyForCookies) {
   content::ResourceRequestInfo::AllocateForTesting(
       match_request.get(),
       content::RESOURCE_TYPE_MAIN_FRAME,
-      NULL,
-      -1,
-      -1,
-      -1,
-      false);
+      NULL,    // context
+      -1,      // render_process_id
+      -1,      // render_view_id
+      -1,      // render_frame_id
+      true,    // is_main_frame
+      false,   // parent_is_main_frame
+      false);  // is_async
   EXPECT_TRUE(result->IsFulfilled(request_data));
 }