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}

2 files changed, 7 insertions, 7 deletions

diff --git a/ios/net/crn_http_protocol_handler.mm b/ios/net/crn_http_protocol_handler.mm
index c841467..453b3b3 100644
--- a/ios/net/crn_http_protocol_handler.mm
+++ b/ios/net/crn_http_protocol_handler.mm
@@ -679,7 +679,7 @@ void HttpProtocolHandlerCore::Start(id<CRNNetworkClientProtocol> base_client) {
   DCHECK(context);
 
   net_request_ =
-      context->CreateRequest(url, DEFAULT_PRIORITY, this, nullptr).release();
+      context->CreateRequest(url, DEFAULT_PRIORITY, this).release();
   net_request_->set_method(base::SysNSStringToUTF8([request_ HTTPMethod]));
 
   net_request_->set_first_party_for_cookies(
diff --git a/ios/net/protocol_handler_util_unittest.mm b/ios/net/protocol_handler_util_unittest.mm
index d2bdc72..da39df6 100644
--- a/ios/net/protocol_handler_util_unittest.mm
+++ b/ios/net/protocol_handler_util_unittest.mm
@@ -127,7 +127,7 @@ class ProtocolHandlerUtilTest : public testing::Test,
     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 @@ TEST_F(ProtocolHandlerUtilTest, GetResponseHttpTest) {
   // 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 @@ TEST_F(ProtocolHandlerUtilTest, BadHttpContentType) {
   // 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 @@ TEST_F(ProtocolHandlerUtilTest, MultipleHttpContentType) {
   // 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 @@ TEST_F(ProtocolHandlerUtilTest, CopyHttpHeaders) {
       @"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 @@ TEST_F(ProtocolHandlerUtilTest, AddMissingHeaders) {
   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));