[Net] Add a priority parameter to URLRequest's constructor

chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.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 "chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.h"
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h"
 #include "content/public/browser/resource_request_info.h"
+#include "net/base/request_priority.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::DictionaryValue;
 using base::FundamentalValue;
 using base::ListValue;
 using base::StringValue;
 using base::Value;
 
@@ skipping 58 matching lines @@
 
   scoped_refptr<const WebRequestConditionAttribute> attribute =
       WebRequestConditionAttribute::Create(
           keys::kResourceTypeKey, &resource_types, &error);
   EXPECT_EQ("", error);
   ASSERT_TRUE(attribute.get());
   EXPECT_EQ(std::string(keys::kResourceTypeKey), attribute->GetName());
 
   net::TestURLRequestContext context;
   net::TestURLRequest url_request_ok(
-      GURL("http://www.example.com"), NULL, &context, NULL);
+      GURL("http://www.example.com"), net::DEFAULT_PRIORITY, NULL, &context);
   content::ResourceRequestInfo::AllocateForTesting(
       &url_request_ok, ResourceType::SUB_FRAME, NULL, -1, -1, false);
   EXPECT_TRUE(attribute->IsFulfilled(WebRequestData(&url_request_ok,
                                                     ON_BEFORE_REQUEST)));
 
   net::TestURLRequest url_request_fail(
-      GURL("http://www.example.com"), NULL, &context, NULL);
+      GURL("http://www.example.com"), net::DEFAULT_PRIORITY, NULL, &context);
   content::ResourceRequestInfo::AllocateForTesting(
       &url_request_fail, ResourceType::MAIN_FRAME, NULL, -1, -1, false);
   EXPECT_FALSE(attribute->IsFulfilled(WebRequestData(&url_request_fail,
                                                      ON_BEFORE_REQUEST)));
 }
 
 TEST(WebRequestConditionAttributeTest, ContentType) {
   // Necessary for TestURLRequest.
   base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
 
   std::string error;
   scoped_refptr<const WebRequestConditionAttribute> result;
 
   net::SpawnedTestServer test_server(
       net::SpawnedTestServer::TYPE_HTTP,
       net::SpawnedTestServer::kLocalhost,
       base::FilePath(FILE_PATH_LITERAL(
           "chrome/test/data/extensions/api_test/webrequest/declarative")));
   ASSERT_TRUE(test_server.Start());
 
   net::TestURLRequestContext context;
   net::TestDelegate delegate;
-  net::TestURLRequest url_request(
-      test_server.GetURL("files/headers.html"), &delegate, &context, NULL);
+  net::TestURLRequest url_request(test_server.GetURL("files/headers.html"),
+                                  net::DEFAULT_PRIORITY,
+                                  &delegate,
+                                  &context);
   url_request.Start();
   base::MessageLoop::current()->Run();
 
   ListValue content_types;
   content_types.Append(new base::StringValue("text/plain"));
   scoped_refptr<const WebRequestConditionAttribute> attribute_include =
       WebRequestConditionAttribute::Create(
           keys::kContentTypeKey, &content_types, &error);
   EXPECT_EQ("", error);
   ASSERT_TRUE(attribute_include.get());
@@ skipping 62 matching lines @@
   ASSERT_EQ("", error);
   ASSERT_TRUE(first_party_attribute.get());
   EXPECT_EQ(std::string(keys::kThirdPartyKey),
             first_party_attribute->GetName());
 
   const GURL url_empty;
   const GURL url_a("http://a.com");
   const GURL url_b("http://b.com");
   net::TestURLRequestContext context;
   net::TestDelegate delegate;
-  net::TestURLRequest url_request(url_a, &delegate, &context, NULL);
+  net::TestURLRequest url_request(
+      url_a, net::DEFAULT_PRIORITY, &delegate, &context);
 
   for (unsigned int i = 1; i <= kLastActiveStage; i <<= 1) {
     if (!(kActiveStages & i))
       continue;
     const RequestStage stage = static_cast<RequestStage>(i);
     url_request.set_first_party_for_cookies(url_empty);
     EXPECT_FALSE(third_party_attribute->IsFulfilled(WebRequestData(&url_request,
                                                                    stage)));
     EXPECT_TRUE(first_party_attribute->IsFulfilled(WebRequestData(&url_request,
                                                                   stage)));
@@ skipping 69 matching lines @@
         WebRequestConditionAttribute::Create(keys::kStagesKey,
                                              &single_stage_list,
                                              &error));
     EXPECT_EQ("", error);
     ASSERT_TRUE(one_stage_attributes.back().get() != NULL);
   }
 
   const GURL url_empty;
   net::TestURLRequestContext context;
   net::TestDelegate delegate;
-  net::TestURLRequest url_request(url_empty, &delegate, &context, NULL);
+  net::TestURLRequest url_request(
+      url_empty, net::DEFAULT_PRIORITY, &delegate, &context);
 
   for (size_t i = 0; i < arraysize(active_stages); ++i) {
     EXPECT_FALSE(empty_attribute->IsFulfilled(
         WebRequestData(&url_request, active_stages[i].first)));
 
     for (size_t j = 0; j < one_stage_attributes.size(); ++j) {
       EXPECT_EQ(i == j,
                 one_stage_attributes[j]->IsFulfilled(
                     WebRequestData(&url_request, active_stages[i].first)));
     }
@@ skipping 103 matching lines @@
 // correctly against request headers. This test is not as extensive as
 // "ResponseHeaders" (below), because the header-matching code is shared
 // by both types of condition attributes, so it is enough to test it once.
 TEST(WebRequestConditionAttributeTest, RequestHeaders) {
   // Necessary for TestURLRequest.
   base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
 
   net::TestURLRequestContext context;
   net::TestDelegate delegate;
   net::TestURLRequest url_request(GURL("http://example.com"),  // Dummy URL.
-                                  &delegate, &context, NULL);
+                                  net::DEFAULT_PRIORITY,
+                                  &delegate,
+                                  &context);
   url_request.SetExtraRequestHeaderByName(
       "Custom-header", "custom/value", true /* overwrite */);
   url_request.Start();
   base::MessageLoop::current()->Run();
 
   std::vector<std::vector<const std::string*> > tests;
   bool result = false;
 
   const RequestStage stage = ON_BEFORE_SEND_HEADERS;
 
@@ skipping 64 matching lines @@
   net::SpawnedTestServer test_server(
       net::SpawnedTestServer::TYPE_HTTP,
       net::SpawnedTestServer::kLocalhost,
       base::FilePath(FILE_PATH_LITERAL(
           "chrome/test/data/extensions/api_test/webrequest/declarative")));
   ASSERT_TRUE(test_server.Start());
 
   net::TestURLRequestContext context;
   net::TestDelegate delegate;
   net::TestURLRequest url_request(test_server.GetURL("files/headers.html"),
-                                  &delegate, &context, NULL);
+                                  net::DEFAULT_PRIORITY,
+                                  &delegate,
+                                  &context);
   url_request.Start();
   base::MessageLoop::current()->Run();
 
   // In all the tests below we assume that the server includes the headers
   // Custom-Header: custom/value
   // Custom-Header-B: valueA
   // Custom-Header-B: valueB
   // Custom-Header-C: valueC, valueD
   // Custom-Header-D:
   // in the response, but does not include "Non-existing: void".
@@ skipping 148 matching lines @@
     keys::kValueEqualsKey, "valueB"
   };
   const size_t kExistingSize[] = { arraysize(kExisting) };
   GetArrayAsVector(kExisting, kExistingSize, 1u, &tests);
   MatchAndCheck(
       tests, keys::kExcludeResponseHeadersKey, stage, &url_request, &result);
   EXPECT_FALSE(result);
 }
 
 }  // namespace extensions