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

chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_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.h"
 
 #include <set>
 
 #include "base/message_loop/message_loop.h"
 #include "base/test/values_test_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h"
 #include "content/public/browser/resource_request_info.h"
 #include "extensions/common/matcher/url_matcher_constants.h"
+#include "net/base/request_priority.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 namespace keys = declarative_webrequest_constants;
 namespace keys2 = url_matcher_constants;
 
 TEST(WebRequestConditionTest, CreateCondition) {
   // Necessary for TestURLRequest.
@@ skipping 44 matching lines @@
       &error);
   EXPECT_EQ("", error);
   ASSERT_TRUE(result.get());
 
   URLMatcherConditionSet::Vector url_matcher_condition_set;
   result->GetURLMatcherConditionSets(&url_matcher_condition_set);
   matcher.AddConditionSets(url_matcher_condition_set);
 
   net::TestURLRequestContext context;
   const GURL http_url("http://www.example.com");
-  net::TestURLRequest match_request(http_url, NULL, &context, NULL);
+  net::TestURLRequest match_request(
+      http_url, net::DEFAULT_PRIORITY, NULL, &context);
   WebRequestData data(&match_request, ON_BEFORE_REQUEST);
   WebRequestDataWithMatchIds request_data(&data);
   request_data.url_match_ids = matcher.MatchURL(http_url);
   EXPECT_EQ(1u, request_data.url_match_ids.size());
   content::ResourceRequestInfo::AllocateForTesting(
       &match_request, ResourceType::MAIN_FRAME, NULL, -1, -1, false);
   EXPECT_TRUE(result->IsFulfilled(request_data));
 
   const GURL https_url("https://www.example.com");
-  net::TestURLRequest wrong_resource_type(https_url, NULL, &context, NULL);
+  net::TestURLRequest wrong_resource_type(
+      https_url, net::DEFAULT_PRIORITY, NULL, &context);
   data.request = &wrong_resource_type;
   request_data.url_match_ids = matcher.MatchURL(http_url);
   // Make sure IsFulfilled does not fail because of URL matching.
   EXPECT_EQ(1u, request_data.url_match_ids.size());
   content::ResourceRequestInfo::AllocateForTesting(
       &wrong_resource_type, ResourceType::SUB_FRAME, NULL, -1, -1, false);
   EXPECT_FALSE(result->IsFulfilled(request_data));
 }
 
 TEST(WebRequestConditionTest, CreateConditionFirstPartyForCookies) {
@@ skipping 16 matching lines @@
   EXPECT_EQ("", error);
   ASSERT_TRUE(result.get());
 
   URLMatcherConditionSet::Vector url_matcher_condition_set;
   result->GetURLMatcherConditionSets(&url_matcher_condition_set);
   matcher.AddConditionSets(url_matcher_condition_set);
 
   net::TestURLRequestContext context;
   const GURL http_url("http://www.example.com");
   const GURL first_party_url("http://fpfc.example.com");
-  net::TestURLRequest match_request(http_url, NULL, &context, NULL);
+  net::TestURLRequest match_request(
+      http_url, net::DEFAULT_PRIORITY, NULL, &context);
   WebRequestData data(&match_request, ON_BEFORE_REQUEST);
   WebRequestDataWithMatchIds request_data(&data);
   request_data.url_match_ids = matcher.MatchURL(http_url);
   EXPECT_EQ(0u, request_data.url_match_ids.size());
   request_data.first_party_url_match_ids = matcher.MatchURL(first_party_url);
   EXPECT_EQ(1u, request_data.first_party_url_match_ids.size());
   content::ResourceRequestInfo::AllocateForTesting(
       &match_request, ResourceType::MAIN_FRAME, NULL, -1, -1, false);
   EXPECT_TRUE(result->IsFulfilled(request_data));
 }
@@ skipping 52 matching lines @@
                "  \"instanceType\": \"declarativeWebRequest.RequestMatcher\", "
                "\n"
                "  \"thirdPartyForCookies\": true, \n"
                "}"),
           &error);
   EXPECT_EQ("", error);
   ASSERT_TRUE(condition_no_url_false.get());
 
   net::TestURLRequestContext context;
   net::TestURLRequest https_request(
-      GURL("https://www.example.com"), NULL, &context, NULL);
+      GURL("https://www.example.com"), net::DEFAULT_PRIORITY, NULL, &context);
 
   // 1. A non-empty condition without UrlFilter attributes is fulfilled iff its
   //    attributes are fulfilled.
   WebRequestData data(&https_request, ON_BEFORE_REQUEST);
   EXPECT_FALSE(
       condition_no_url_false->IsFulfilled(WebRequestDataWithMatchIds(&data)));
 
   data = WebRequestData(&https_request, ON_BEFORE_REQUEST);
   EXPECT_TRUE(
       condition_no_url_true->IsFulfilled(WebRequestDataWithMatchIds(&data)));
@@ skipping 38 matching lines @@
 
   // Tell the URLMatcher about our shiny new patterns.
   URLMatcherConditionSet::Vector url_matcher_condition_set;
   result->GetURLMatcherConditionSets(&url_matcher_condition_set);
   matcher.AddConditionSets(url_matcher_condition_set);
 
   // Test that the result is correct and matches http://www.example.com and
   // https://www.example.com
   GURL http_url("http://www.example.com");
   net::TestURLRequestContext context;
-  net::TestURLRequest http_request(http_url, NULL, &context, NULL);
+  net::TestURLRequest http_request(
+      http_url, net::DEFAULT_PRIORITY, NULL, &context);
   WebRequestData data(&http_request, ON_BEFORE_REQUEST);
   WebRequestDataWithMatchIds request_data(&data);
   request_data.url_match_ids = matcher.MatchURL(http_url);
   EXPECT_EQ(1u, request_data.url_match_ids.size());
   EXPECT_TRUE(result->IsFulfilled(*(request_data.url_match_ids.begin()),
                                   request_data));
 
   GURL https_url("https://www.example.com");
   request_data.url_match_ids = matcher.MatchURL(https_url);
   EXPECT_EQ(1u, request_data.url_match_ids.size());
-  net::TestURLRequest https_request(https_url, NULL, &context, NULL);
+  net::TestURLRequest https_request(
+      https_url, net::DEFAULT_PRIORITY, NULL, &context);
   data.request = &https_request;
   EXPECT_TRUE(result->IsFulfilled(*(request_data.url_match_ids.begin()),
                                   request_data));
 
   // Check that both, hostPrefix and hostSuffix are evaluated.
   GURL https_foo_url("https://foo.example.com");
   request_data.url_match_ids = matcher.MatchURL(https_foo_url);
   EXPECT_EQ(0u, request_data.url_match_ids.size());
-  net::TestURLRequest https_foo_request(https_foo_url, NULL, &context, NULL);
+  net::TestURLRequest https_foo_request(
+      https_foo_url, net::DEFAULT_PRIORITY, NULL, &context);
   data.request = &https_foo_request;
   EXPECT_FALSE(result->IsFulfilled(-1, request_data));
 }
 
 TEST(WebRequestConditionTest, TestPortFilter) {
   // Necessary for TestURLRequest.
   base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
   URLMatcher matcher;
 
   WebRequestConditionSet::AnyVector conditions;
@@ skipping 17 matching lines @@
   // Tell the URLMatcher about our shiny new patterns.
   URLMatcherConditionSet::Vector url_matcher_condition_set;
   result->GetURLMatcherConditionSets(&url_matcher_condition_set);
   matcher.AddConditionSets(url_matcher_condition_set);
 
   std::set<URLMatcherConditionSet::ID> url_match_ids;
 
   // Test various URLs.
   GURL http_url("http://www.example.com");
   net::TestURLRequestContext context;
-  net::TestURLRequest http_request(http_url, NULL, &context, NULL);
+  net::TestURLRequest http_request(
+      http_url, net::DEFAULT_PRIORITY, NULL, &context);
   url_match_ids = matcher.MatchURL(http_url);
   ASSERT_EQ(1u, url_match_ids.size());
 
   GURL http_url_80("http://www.example.com:80");
-  net::TestURLRequest http_request_80(http_url_80, NULL, &context, NULL);
+  net::TestURLRequest http_request_80(
+      http_url_80, net::DEFAULT_PRIORITY, NULL, &context);
   url_match_ids = matcher.MatchURL(http_url_80);
   ASSERT_EQ(1u, url_match_ids.size());
 
   GURL http_url_1000("http://www.example.com:1000");
-  net::TestURLRequest http_request_1000(http_url_1000, NULL, &context, NULL);
+  net::TestURLRequest http_request_1000(
+      http_url_1000, net::DEFAULT_PRIORITY, NULL, &context);
   url_match_ids = matcher.MatchURL(http_url_1000);
   ASSERT_EQ(1u, url_match_ids.size());
 
   GURL http_url_2000("http://www.example.com:2000");
-  net::TestURLRequest http_request_2000(http_url_2000, NULL, &context, NULL);
+  net::TestURLRequest http_request_2000(
+      http_url_2000, net::DEFAULT_PRIORITY, NULL, &context);
   url_match_ids = matcher.MatchURL(http_url_2000);
   ASSERT_EQ(0u, url_match_ids.size());
 }
 
 // Create a condition with two attributes: one on the request header and one on
 // the response header. The Create() method should fail and complain that it is
 // impossible that both conditions are fulfilled at the same time.
 TEST(WebRequestConditionTest, ConditionsWithConflictingStages) {
   // Necessary for TestURLRequest.
   base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
@@ skipping 14 matching lines @@
            // filters.
            "  \"requestHeaders\": [{}], \n"
            "  \"responseHeaders\": [{}], \n"
            "}"),
       &error);
   EXPECT_FALSE(error.empty());
   EXPECT_FALSE(result.get());
 }
 
 }  // namespace extensions