Added URLRequestContext to constructor for URLRequest.

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.h"
 #include "base/values.h"
@@ skipping 50 matching lines @@
   EXPECT_FALSE(error.empty());
   EXPECT_FALSE(result.get());
 
   // Test success (can we support multiple criteria?)
   error.clear();
   result = WebRequestCondition::Create(matcher.condition_factory(),
                                        valid_condition, &error);
   EXPECT_EQ("", error);
   ASSERT_TRUE(result.get());
 
-  TestURLRequest match_request(GURL("http://www.example.com"), NULL);
+  TestURLRequestContext context;
+  TestURLRequest match_request(GURL("http://www.example.com"), NULL, &context);
   content::ResourceRequestInfo::AllocateForTesting(&match_request,
       ResourceType::MAIN_FRAME, NULL, -1, -1);
   EXPECT_TRUE(result->IsFulfilled(&match_request, ON_BEFORE_REQUEST));
 
-  TestURLRequest wrong_resource_type(GURL("https://www.example.com"), NULL);
+  TestURLRequest wrong_resource_type(
+      GURL("https://www.example.com"), NULL, &context);
   content::ResourceRequestInfo::AllocateForTesting(&wrong_resource_type,
       ResourceType::SUB_FRAME, NULL, -1, -1);
   EXPECT_FALSE(result->IsFulfilled(&wrong_resource_type, ON_BEFORE_REQUEST));
 }
 
 TEST(WebRequestConditionTest, CreateConditionSet) {
   // Necessary for TestURLRequest.
   MessageLoop message_loop(MessageLoop::TYPE_IO);
   URLMatcher matcher;
 
@@ skipping 41 matching lines @@
   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;
   int number_matches = 0;
 
   // Test that the result is correct and matches http://www.example.com and
   // https://www.example.com
   GURL http_url("http://www.example.com");
-  TestURLRequest http_request(http_url, NULL);
+  TestURLRequestContext context;
+  TestURLRequest http_request(http_url, NULL, &context);
   url_match_ids = matcher.MatchURL(http_url);
   for (std::set<URLMatcherConditionSet::ID>::iterator i = url_match_ids.begin();
        i != url_match_ids.end(); ++i) {
     if (result->IsFulfilled(*i, &http_request, ON_BEFORE_REQUEST))
       ++number_matches;
   }
   EXPECT_EQ(1, number_matches);
 
   GURL https_url("https://www.example.com");
   url_match_ids = matcher.MatchURL(https_url);
-  TestURLRequest https_request(https_url, NULL);
+  TestURLRequest https_request(https_url, NULL, &context);
   number_matches = 0;
   for (std::set<URLMatcherConditionSet::ID>::iterator i = url_match_ids.begin();
        i != url_match_ids.end(); ++i) {
     if (result->IsFulfilled(*i, &https_request, ON_BEFORE_REQUEST))
       ++number_matches;
   }
   EXPECT_EQ(1, number_matches);
 
   // Check that both, hostPrefix and hostSuffix are evaluated.
   GURL https_foo_url("https://foo.example.com");
   url_match_ids = matcher.MatchURL(https_foo_url);
-  TestURLRequest https_foo_request(https_foo_url, NULL);
+  TestURLRequest https_foo_request(https_foo_url, NULL, &context);
   number_matches = 0;
   for (std::set<URLMatcherConditionSet::ID>::iterator i = url_match_ids.begin();
        i != url_match_ids.end(); ++i) {
     if (result->IsFulfilled(*i, &https_foo_request, ON_BEFORE_REQUEST))
       ++number_matches;
   }
   EXPECT_EQ(0, number_matches);
 }
 
 TEST(WebRequestConditionTest, TestPortFilter) {
@@ skipping 34 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");
-  TestURLRequest http_request(http_url, NULL);
+  TestURLRequestContext context;
+  TestURLRequest http_request(http_url, 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");
-  TestURLRequest http_request_80(http_url_80, NULL);
+  TestURLRequest http_request_80(http_url_80, 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");
-  TestURLRequest http_request_1000(http_url_1000, NULL);
+  TestURLRequest http_request_1000(http_url_1000, 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");
-  TestURLRequest http_request_2000(http_url_2000, NULL);
+  TestURLRequest http_request_2000(http_url_2000, NULL, &context);
   url_match_ids = matcher.MatchURL(http_url_2000);
   ASSERT_EQ(0u, url_match_ids.size());
 }
 
 }  // namespace extensions