Shift URLRequestContextStorage over to taking scoped_ptrs.

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 95 matching lines @@
 }
 
 SpdySessionDependencies* CreateSpdySessionDependencies(
     SpdyNetworkTransactionTestParams test_params) {
   SpdySessionDependencies* session_deps =
       new SpdySessionDependencies(test_params.protocol);
   UpdateSpdySessionDependencies(test_params, session_deps);
   return session_deps;
 }
 
 SpdySessionDependencies* CreateSpdySessionDependencies(

[pauljensen, 2015/08/28 13:38:03]

would be nice to make this a scoped_ptr too

[Randy Smith (Not in Mondays), 2015/09/02 23:42:20]

Done.

     SpdyNetworkTransactionTestParams test_params,
-    ProxyService* proxy_service) {
+    scoped_ptr<ProxyService> proxy_service) {
   SpdySessionDependencies* session_deps =
-      new SpdySessionDependencies(test_params.protocol, proxy_service);
+      new SpdySessionDependencies(test_params.protocol, proxy_service.Pass());
   UpdateSpdySessionDependencies(test_params, session_deps);
   return session_deps;
 }
 
 }  // namespace
 
 class SpdyNetworkTransactionTest
     : public ::testing::TestWithParam<SpdyNetworkTransactionTestParams> {
  protected:
   SpdyNetworkTransactionTest() : spdy_util_(GetParam().protocol) {
@@ skipping 4350 matching lines @@
   if (spdy_util_.spdy_version() < HTTP2)
     return;
   // HTTP_1_1_REQUIRED implementation relies on the assumption that HTTP/2 is
   // only spoken over SSL.
   if (GetParam().ssl_type != HTTPS_SPDY_VIA_NPN)
     return;
 
   HttpRequestInfo request;
   request.method = "GET";
   request.url = GURL("https://www.example.org/");
+

[pauljensen, 2015/08/28 13:38:02]

unnecessary whitespace change?

[Randy Smith (Not in Mondays), 2015/09/02 23:42:20]

Done.

   scoped_ptr<SpdySessionDependencies> session_deps(
       CreateSpdySessionDependencies(
           GetParam(),
           ProxyService::CreateFixedFromPacResult("HTTPS myproxy:70")));
   // Do not force SPDY so that second socket can negotiate HTTP/1.1.
   session_deps->next_protos = SpdyNextProtos();
   NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY, BoundNetLog(),
                                      GetParam(), session_deps.release());
 
   // First socket: HTTP/2 CONNECT rejected with HTTP_1_1_REQUIRED.
@@ skipping 76 matching lines @@
   EXPECT_EQ(70, response->socket_address.port());
   std::string response_data;
   ASSERT_EQ(OK, ReadTransaction(helper.trans(), &response_data));
   EXPECT_EQ("hello", response_data);
 }
 
 // Test to make sure we can correctly connect through a proxy.
 TEST_P(SpdyNetworkTransactionTest, ProxyConnect) {
   NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
                                      BoundNetLog(), GetParam(), NULL);
+

[pauljensen, 2015/08/28 13:38:02]

ditto

[Randy Smith (Not in Mondays), 2015/09/02 23:42:20]

Done.

   helper.session_deps().reset(CreateSpdySessionDependencies(
-      GetParam(),
-      ProxyService::CreateFixedFromPacResult("PROXY myproxy:70")));
+      GetParam(), ProxyService::CreateFixedFromPacResult("PROXY myproxy:70")));

[pauljensen, 2015/08/28 13:38:02]

a formatting change...to an unrelated line...perhaps precipitated by the change
on line 4588

[Randy Smith (Not in Mondays), 2015/09/02 23:42:20]

Moot, since there's now a substantive change on 4589 due to switching
CreateSpdySessionDependencies over to returning a scoped_ptr.

   helper.SetSession(make_scoped_refptr(
       SpdySessionDependencies::SpdyCreateSession(helper.session_deps().get())));
   helper.RunPreTestSetup();
   HttpNetworkTransaction* trans = helper.trans();
 
   const char kConnect443[] = {
       "CONNECT www.example.org:443 HTTP/1.1\r\n"
       "Host: www.example.org\r\n"
       "Proxy-Connection: keep-alive\r\n\r\n"};
   const char kHTTP200[] = {"HTTP/1.1 200 OK\r\n\r\n"};
@@ skipping 2030 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