Remove prerender cookie store, part 4.

net/spdy/spdy_network_transaction_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 <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_util.h"
@@ skipping 2467 matching lines @@
   OrderedSocketData data2(reads2, arraysize(reads2),
                           writes2, arraysize(writes2));
 
   // TODO(erikchen): Make test support SPDYSSL, SPDYNPN
   TestDelegate d;
   {
     SpdyURLRequestContext spdy_url_request_context(
         GetParam().protocol,
         false  /* force_spdy_over_ssl*/,
         true  /* force_spdy_always */);
-    scoped_ptr<URLRequest> r(
-        spdy_url_request_context.CreateRequest(GURL("http://www.google.com/"),
-                                               DEFAULT_PRIORITY,
-                                               &d,
-                                               NULL));
+    scoped_ptr<URLRequest> r(spdy_url_request_context.CreateRequest(
+        GURL("http://www.google.com/"), DEFAULT_PRIORITY, &d));
     spdy_url_request_context.socket_factory().
         AddSocketDataProvider(&data);
     spdy_url_request_context.socket_factory().
         AddSocketDataProvider(&data2);
 
     d.set_quit_on_redirect(true);
     r->Start();
     base::RunLoop().Run();
 
     EXPECT_EQ(1, d.received_redirect_count());
@@ skipping 70 matching lines @@
                           writes2, arraysize(writes2));
 
   // TODO(erikchen): Make test support SPDYSSL, SPDYNPN
   TestDelegate d;
   TestDelegate d2;
   SpdyURLRequestContext spdy_url_request_context(
       GetParam().protocol,
       false  /* force_spdy_over_ssl*/,
       true  /* force_spdy_always */);
   {
-    scoped_ptr<URLRequest> r(
-        spdy_url_request_context.CreateRequest(GURL("http://www.google.com/"),
-                                               DEFAULT_PRIORITY,
-                                               &d,
-                                               NULL));
+    scoped_ptr<URLRequest> r(spdy_url_request_context.CreateRequest(
+        GURL("http://www.google.com/"), DEFAULT_PRIORITY, &d));
     spdy_url_request_context.socket_factory().
         AddSocketDataProvider(&data);
 
     r->Start();
     base::RunLoop().Run();
 
     EXPECT_EQ(0, d.received_redirect_count());
     std::string contents("hello!");
     EXPECT_EQ(contents, d.data_received());
 
-    scoped_ptr<URLRequest> r2(
-        spdy_url_request_context.CreateRequest(
-            GURL("http://www.google.com/foo.dat"),
-            DEFAULT_PRIORITY,
-            &d2,
-            NULL));
+    scoped_ptr<URLRequest> r2(spdy_url_request_context.CreateRequest(
+        GURL("http://www.google.com/foo.dat"), DEFAULT_PRIORITY, &d2));
     spdy_url_request_context.socket_factory().
         AddSocketDataProvider(&data2);
 
     d2.set_quit_on_redirect(true);
     r2->Start();
     base::RunLoop().Run();
     EXPECT_EQ(1, d2.received_redirect_count());
 
     r2->FollowDeferredRedirect();
     base::RunLoop().Run();
@@ skipping 4205 matching lines @@
 TEST_P(SpdyNetworkTransactionTLSUsageCheckTest, TLSCipherSuiteSucky) {
   scoped_ptr<SSLSocketDataProvider> ssl_provider(
       new SSLSocketDataProvider(ASYNC, OK));
   // Set to TLS_RSA_WITH_NULL_MD5
   SSLConnectionStatusSetCipherSuite(0x1, &ssl_provider->connection_status);
 
   RunTLSUsageCheckTest(ssl_provider.Pass());
 }
 
 }  // namespace net