commit 151423e1851b45000257ef2d32ee0984a24133c7
author davidben <davidben@chromium.org> Mon Mar 23 18:48:36 2015
committer Commit bot <commit-bot@chromium.org> Mon Mar 23 18:49:16 2015
tree cea7e7af8cf5771d650b8a72ebf74a887a4b8f94
parent 8758634a7c0c79481469f50c9c8f1c580169adec

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}

ios/net/protocol_handler_util_unittest.mm

diff --git a/ios/net/protocol_handler_util_unittest.mm b/ios/net/protocol_handler_util_unittest.mm
index d2bdc72c..da39df6 100644
--- a/ios/net/protocol_handler_util_unittest.mm
+++ b/ios/net/protocol_handler_util_unittest.mm
@@ -127,7 +127,7 @@
     GURL url(url_string);
 
     scoped_ptr<URLRequest> request(
-        request_context_->CreateRequest(url, DEFAULT_PRIORITY, this, nullptr));
+        request_context_->CreateRequest(url, DEFAULT_PRIORITY, this));
     request->Start();
     base::RunLoop loop;
     loop.RunUntilIdle();
@@ -169,7 +169,7 @@
   // Create a request.
   GURL url(std::string("http://url"));
   scoped_ptr<URLRequest> request(
-      request_context_->CreateRequest(url, DEFAULT_PRIORITY, this, nullptr));
+      request_context_->CreateRequest(url, DEFAULT_PRIORITY, this));
   request->Start();
   // Create a response from the request.
   NSURLResponse* response = GetNSURLResponseForRequest(request.get());
@@ -196,7 +196,7 @@
   // content-type in the test framework.
   GURL url(std::string("http://badcontenttype"));
   scoped_ptr<URLRequest> request(
-      request_context_->CreateRequest(url, DEFAULT_PRIORITY, this, nullptr));
+      request_context_->CreateRequest(url, DEFAULT_PRIORITY, this));
   request->Start();
   // Create a response from the request.
   @try {
@@ -212,7 +212,7 @@
   // content-type in the test framework.
   GURL url(std::string("http://multiplecontenttype"));
   scoped_ptr<URLRequest> request(
-      request_context_->CreateRequest(url, DEFAULT_PRIORITY, this, nullptr));
+      request_context_->CreateRequest(url, DEFAULT_PRIORITY, this));
   request->Start();
   // Create a response from the request.
   NSURLResponse* response = GetNSURLResponseForRequest(request.get());
@@ -235,7 +235,7 @@
       @"Foo" : @"bar",
   }];
   scoped_ptr<URLRequest> out_request(
-      request_context_->CreateRequest(url, DEFAULT_PRIORITY, nullptr, nullptr));
+      request_context_->CreateRequest(url, DEFAULT_PRIORITY, nullptr));
   CopyHttpHeaders(in_request, out_request.get());
 
   EXPECT_EQ("referrer", out_request->referrer());
@@ -254,7 +254,7 @@
   base::scoped_nsobject<NSMutableURLRequest> in_request(
       [[NSMutableURLRequest alloc] initWithURL:NSURLWithGURL(url)]);
   scoped_ptr<URLRequest> out_request(
-      request_context_->CreateRequest(url, DEFAULT_PRIORITY, nullptr, nullptr));
+      request_context_->CreateRequest(url, DEFAULT_PRIORITY, nullptr));
   out_request->set_method("POST");
   scoped_ptr<UploadElementReader> reader(
       new UploadBytesElementReader(nullptr, 0));