Remove prerender cookie store, part 4.

This removes the ability to pass in a custom CookieStore to a URLRequest. It's
a small change to net/url_request which then balloons to everything in the
project that ever makes a URLRequest.

This reverts the rest of https://codereview.chromium.org/188693003 (and then
does a whole lot more because URLRequest constructors were unified recently to
always require passing in the fourth argument).

BUG=457344

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

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

8 files changed, 14 insertions, 18 deletions

diff --git a/components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_resource_throttle_unittest.cc b/components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_resource_throttle_unittest.cc
index cca6bfa..e7e3789 100644
--- a/components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_resource_throttle_unittest.cc
+++ b/components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_resource_throttle_unittest.cc
@@ -73,7 +73,7 @@ class DataReductionProxyDebugResourceThrottleTest : public testing::Test {
             .WithMockConfig()
             .Build();
     request_ = context_.CreateRequest(GURL("http://www.google.com/"), net::IDLE,
-                                      &delegate_, NULL);
+                                      &delegate_);
     ui_service_.reset(new ContentDataReductionProxyDebugUIService(
         base::Bind(
             &DataReductionProxyDebugResourceThrottleTest::
diff --git a/components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_ui_manager_unittest.cc b/components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_ui_manager_unittest.cc
index a6caefe..d0da16b 100644
--- a/components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_ui_manager_unittest.cc
+++ b/components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_ui_manager_unittest.cc
@@ -62,7 +62,7 @@ class DataReductionProxyDebugUIManagerTest
  public:
   DataReductionProxyDebugUIManagerTest()
       : state_(NOT_CALLED),
-        request_(context_.CreateRequest(GURL(), net::IDLE, &delegate_, NULL)) {
+        request_(context_.CreateRequest(GURL(), net::IDLE, &delegate_)) {
     ui_manager_ = new TestDataReductionProxyDebugUIManager(
         content::BrowserThread::GetMessageLoopProxyForThread(
             content::BrowserThread::UI),
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol_unittest.cc
index ba34dc7..281b308 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol_unittest.cc
@@ -251,8 +251,7 @@ class DataReductionProxyProtocolTest : public testing::Test {
     scoped_ptr<URLRequest> r(context_->CreateRequest(
         GURL("http://www.google.com/"),
         net::DEFAULT_PRIORITY,
-        &d,
-        NULL));
+        &d));
     r->set_method(method);
     r->SetLoadFlags(net::LOAD_NORMAL);
 
@@ -358,7 +357,6 @@ TEST_F(DataReductionProxyProtocolTest, TestIdempotency) {
     scoped_ptr<net::URLRequest> request(
         context.CreateRequest(GURL("http://www.google.com/"),
                               net::DEFAULT_PRIORITY,
-                              NULL,
                               NULL));
     request->set_method(tests[i].method);
     EXPECT_EQ(
@@ -852,8 +850,7 @@ TEST_F(DataReductionProxyProtocolTest,
   scoped_ptr<URLRequest> r(context_->CreateRequest(
       GURL("http://www.google.com/"),
       net::DEFAULT_PRIORITY,
-      &d,
-      NULL));
+      &d));
   r->set_method("GET");
   r->SetLoadFlags(net::LOAD_NORMAL);
 
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc
index 57c8beb..10b91ed 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc
@@ -158,7 +158,7 @@ TEST_F(DataReductionProxyInterceptorTest, TestJobFactoryChaining) {
 
   net::TestDelegate d;
   scoped_ptr<net::URLRequest> req(default_context_->CreateRequest(
-      GURL("http://foo"), net::DEFAULT_PRIORITY, &d, nullptr));
+      GURL("http://foo"), net::DEFAULT_PRIORITY, &d));
 
   req->Start();
   base::RunLoop().Run();
@@ -252,7 +252,7 @@ TEST_F(DataReductionProxyInterceptorWithServerTest, TestBypass) {
   net::TestDelegate delegate;
   scoped_ptr<net::URLRequest> request(
       context().CreateRequest(direct().GetURL("/block10.html"),
-                             net::DEFAULT_PRIORITY, &delegate, NULL));
+                             net::DEFAULT_PRIORITY, &delegate));
   request->Start();
   EXPECT_TRUE(request->is_pending());
   base::RunLoop().Run();
@@ -266,7 +266,7 @@ TEST_F(DataReductionProxyInterceptorWithServerTest, TestNoBypass) {
   net::TestDelegate delegate;
   scoped_ptr<net::URLRequest> request(
       context().CreateRequest(direct().GetURL("/noblock.html"),
-                             net::DEFAULT_PRIORITY, &delegate, NULL));
+                             net::DEFAULT_PRIORITY, &delegate));
   request->Start();
   EXPECT_TRUE(request->is_pending());
   base::RunLoop().Run();
@@ -310,7 +310,7 @@ class DataReductionProxyInterceptorEndToEndTest : public testing::Test {
   // it. Returns the created URLRequest.
   scoped_ptr<net::URLRequest> CreateAndExecuteRequest(const GURL& url) {
     scoped_ptr<net::URLRequest> request(
-        context_.CreateRequest(url, net::IDLE, &delegate_, NULL));
+        context_.CreateRequest(url, net::IDLE, &delegate_));
     request->Start();
     drp_test_context_->RunUntilIdle();
     return request.Pass();
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data_unittest.cc
index e877e85..0d240e9 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data_unittest.cc
@@ -103,7 +103,7 @@ TEST_F(DataReductionProxyIODataTest, TestConstruction) {
   // DataReductionProxyNetworkDelegateTest.
    scoped_ptr<net::URLRequest> fake_request =
        context().CreateRequest(
-           GURL("http://www.foo.com/"), net::IDLE, delegate(), NULL);
+           GURL("http://www.foo.com/"), net::IDLE, delegate());
   CountingNetworkDelegate* wrapped_network_delegate =
       new CountingNetworkDelegate();
   scoped_ptr<DataReductionProxyNetworkDelegate> network_delegate =
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_metrics_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_metrics_unittest.cc
index 87df9bfe..1abf5c2 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_metrics_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_metrics_unittest.cc
@@ -787,7 +787,7 @@ TEST_F(ChromeNetworkDailyDataSavingMetricsTest,
 
     net::TestDelegate delegate;
     scoped_ptr<net::URLRequest> request =
-        context.CreateRequest(test_case.url, net::IDLE, &delegate, nullptr);
+        context.CreateRequest(test_case.url, net::IDLE, &delegate);
     request->SetLoadFlags(test_case.load_flags);
     request->Start();
     test_context->RunUntilIdle();
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc
index f88505a..d3b534f 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc
@@ -107,7 +107,7 @@ class DataReductionProxyNetworkDelegateTest : public testing::Test {
       const std::string& raw_response_headers,
       int64 response_content_length) {
     scoped_ptr<net::URLRequest> request = context_.CreateRequest(
-        url, net::IDLE, &delegate_, NULL);
+        url, net::IDLE, &delegate_);
 
     // Create a test job that will fill in the given response headers for the
     // |fake_request|.
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats_unittest.cc
index ac75479..d5c2e68 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats_unittest.cc
@@ -81,15 +81,14 @@ class DataReductionProxyUsageStatsTest : public testing::Test {
                     ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN)
             .WithMockConfig()
             .Build();
-    mock_url_request_ = context_.CreateRequest(GURL(), net::IDLE, &delegate_,
-                                               NULL);
+    mock_url_request_ = context_.CreateRequest(GURL(), net::IDLE, &delegate_);
   }
 
   scoped_ptr<net::URLRequest> CreateURLRequestWithResponseHeaders(
       const GURL& url,
       const std::string& raw_response_headers) {
     scoped_ptr<net::URLRequest> fake_request = context_.CreateRequest(
-        url, net::IDLE, &delegate_, NULL);
+        url, net::IDLE, &delegate_);
 
     // Create a test job that will fill in the given response headers for the
     // |fake_request|.
@@ -622,7 +621,7 @@ class DataReductionProxyUsageStatsEndToEndTest : public testing::Test {
     }
 
     scoped_ptr<net::URLRequest> request(
-        context_.CreateRequest(url, net::IDLE, &delegate_, NULL));
+        context_.CreateRequest(url, net::IDLE, &delegate_));
     request->set_method("GET");
     request->SetLoadFlags(net::LOAD_NORMAL);
     request->Start();