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}

1 files changed, 3 insertions, 3 deletions

diff --git a/net/websockets/websocket_end_to_end_test.cc b/net/websockets/websocket_end_to_end_test.cc
index e652fe0..e675d8b 100644
--- a/net/websockets/websocket_end_to_end_test.cc
+++ b/net/websockets/websocket_end_to_end_test.cc
@@ -354,7 +354,7 @@ TEST_F(WebSocketEndToEndTest, DISABLED_ON_ANDROID(HttpsProxyUsed)) {
       AuthCredentials(base::ASCIIToUTF16("foo"), base::ASCIIToUTF16("bar")));
   {
     scoped_ptr<URLRequest> request(
-        context_.CreateRequest(http_page, DEFAULT_PRIORITY, &delegate, NULL));
+        context_.CreateRequest(http_page, DEFAULT_PRIORITY, &delegate));
     request->Start();
     // TestDelegate exits the message loop when the request completes by
     // default.
@@ -400,7 +400,7 @@ TEST_F(WebSocketEndToEndTest, DISABLED_ON_ANDROID(HstsHttpsToWebSocket)) {
   TestDelegate delegate;
   GURL https_page = https_server.GetURL("files/hsts-headers.html");
   scoped_ptr<URLRequest> request(
-      context_.CreateRequest(https_page, DEFAULT_PRIORITY, &delegate, NULL));
+      context_.CreateRequest(https_page, DEFAULT_PRIORITY, &delegate));
   request->Start();
   // TestDelegate exits the message loop when the request completes.
   base::RunLoop().Run();
@@ -433,7 +433,7 @@ TEST_F(WebSocketEndToEndTest, DISABLED_ON_ANDROID(HstsWebSocketToHttps)) {
   GURL http_page =
       ReplaceUrlScheme(https_server.GetURL("files/simple.html"), "http");
   scoped_ptr<URLRequest> request(
-      context_.CreateRequest(http_page, DEFAULT_PRIORITY, &delegate, NULL));
+      context_.CreateRequest(http_page, DEFAULT_PRIORITY, &delegate));
   request->Start();
   // TestDelegate exits the message loop when the request completes.
   base::RunLoop().Run();