Remove prerender cookie store, part 4.

extensions/browser/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 "extensions/browser/api/declarative_webrequest/webrequest_condition.h"
 
 #include <set>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 62 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");
-  scoped_ptr<net::URLRequest> match_request(context.CreateRequest(
-      http_url, net::DEFAULT_PRIORITY, NULL, NULL));
+  scoped_ptr<net::URLRequest> match_request(
+      context.CreateRequest(http_url, net::DEFAULT_PRIORITY, NULL));
   WebRequestData data(match_request.get(), 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.get(),
       content::RESOURCE_TYPE_MAIN_FRAME,
       NULL,    // context
       -1,      // render_process_id
       -1,      // render_view_id
       -1,      // render_frame_id
       true,    // is_main_frame
       false,   // parent_is_main_frame
       true,   // allow_download
       false);  // is_async
   EXPECT_TRUE(result->IsFulfilled(request_data));
 
   const GURL https_url("https://www.example.com");
-  scoped_ptr<net::URLRequest> wrong_resource_type(context.CreateRequest(
-      https_url, net::DEFAULT_PRIORITY, NULL, NULL));
+  scoped_ptr<net::URLRequest> wrong_resource_type(
+      context.CreateRequest(https_url, net::DEFAULT_PRIORITY, NULL));
   data.request = wrong_resource_type.get();
   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.get(),
       content::RESOURCE_TYPE_SUB_FRAME,
       NULL,    // context
       -1,      // render_process_id
       -1,      // render_view_id
@@ skipping 25 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");
-  scoped_ptr<net::URLRequest> match_request(context.CreateRequest(
-      http_url, net::DEFAULT_PRIORITY, NULL, NULL));
+  scoped_ptr<net::URLRequest> match_request(
+      context.CreateRequest(http_url, net::DEFAULT_PRIORITY, NULL));
   WebRequestData data(match_request.get(), 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.get(),
       content::RESOURCE_TYPE_MAIN_FRAME,
       NULL,    // context
@@ skipping 61 matching lines @@
                "  \"instanceType\": \"declarativeWebRequest.RequestMatcher\", "
                "\n"
                "  \"thirdPartyForCookies\": true, \n"
                "}"),
           &error);
   EXPECT_EQ("", error);
   ASSERT_TRUE(condition_no_url_false.get());
 
   net::TestURLRequestContext context;
   scoped_ptr<net::URLRequest> https_request(context.CreateRequest(
-      GURL("https://www.example.com"), net::DEFAULT_PRIORITY, NULL, NULL));
+      GURL("https://www.example.com"), net::DEFAULT_PRIORITY, NULL));
 
   // 1. A non-empty condition without UrlFilter attributes is fulfilled iff its
   //    attributes are fulfilled.
   WebRequestData data(https_request.get(), ON_BEFORE_REQUEST);
   EXPECT_FALSE(
       condition_no_url_false->IsFulfilled(WebRequestDataWithMatchIds(&data)));
 
   data = WebRequestData(https_request.get(), 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;
-  scoped_ptr<net::URLRequest> http_request(context.CreateRequest(
-      http_url, net::DEFAULT_PRIORITY, NULL, NULL));
+  scoped_ptr<net::URLRequest> http_request(
+      context.CreateRequest(http_url, net::DEFAULT_PRIORITY, NULL));
   WebRequestData data(http_request.get(), 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());
-  scoped_ptr<net::URLRequest> https_request(context.CreateRequest(
-      https_url, net::DEFAULT_PRIORITY, NULL, NULL));
+  scoped_ptr<net::URLRequest> https_request(
+      context.CreateRequest(https_url, net::DEFAULT_PRIORITY, NULL));
   data.request = https_request.get();
   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());
-  scoped_ptr<net::URLRequest> https_foo_request(context.CreateRequest(
-      https_foo_url, net::DEFAULT_PRIORITY, NULL, NULL));
+  scoped_ptr<net::URLRequest> https_foo_request(
+      context.CreateRequest(https_foo_url, net::DEFAULT_PRIORITY, NULL));
   data.request = https_foo_request.get();
   EXPECT_FALSE(result->IsFulfilled(-1, request_data));
 }
 
 TEST(WebRequestConditionTest, TestPortFilter) {
   // Necessary for TestURLRequest.
   base::MessageLoopForIO message_loop;
   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;
-  scoped_ptr<net::URLRequest> http_request(context.CreateRequest(
-      http_url, net::DEFAULT_PRIORITY, NULL, NULL));
+  scoped_ptr<net::URLRequest> http_request(
+      context.CreateRequest(http_url, net::DEFAULT_PRIORITY, NULL));
   url_match_ids = matcher.MatchURL(http_url);
   ASSERT_EQ(1u, url_match_ids.size());
 
   GURL http_url_80("http://www.example.com:80");
-  scoped_ptr<net::URLRequest> http_request_80(context.CreateRequest(
-      http_url_80, net::DEFAULT_PRIORITY, NULL, NULL));
+  scoped_ptr<net::URLRequest> http_request_80(
+      context.CreateRequest(http_url_80, net::DEFAULT_PRIORITY, NULL));
   url_match_ids = matcher.MatchURL(http_url_80);
   ASSERT_EQ(1u, url_match_ids.size());
 
   GURL http_url_1000("http://www.example.com:1000");
-  scoped_ptr<net::URLRequest> http_request_1000(context.CreateRequest(
-      http_url_1000, net::DEFAULT_PRIORITY, NULL, NULL));
+  scoped_ptr<net::URLRequest> http_request_1000(
+      context.CreateRequest(http_url_1000, net::DEFAULT_PRIORITY, NULL));
   url_match_ids = matcher.MatchURL(http_url_1000);
   ASSERT_EQ(1u, url_match_ids.size());
 
   GURL http_url_2000("http://www.example.com:2000");
-  scoped_ptr<net::URLRequest> http_request_2000(context.CreateRequest(
-      http_url_2000, net::DEFAULT_PRIORITY, NULL, NULL));
+  scoped_ptr<net::URLRequest> http_request_2000(
+      context.CreateRequest(http_url_2000, net::DEFAULT_PRIORITY, NULL));
   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::MessageLoopForIO message_loop;
@@ skipping 14 matching lines @@
            // filters.
            "  \"requestHeaders\": [{}], \n"
            "  \"responseHeaders\": [{}], \n"
            "}"),
       &error);
   EXPECT_FALSE(error.empty());
   EXPECT_FALSE(result.get());
 }
 
 }  // namespace extensions