Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(708)

Unified Diff: net/spdy/spdy_test_util_common.cc

Issue 1290243007: Shift URLRequestContextStorage over to taking scoped_ptrs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Paul_BuilderGrab
Patch Set: Lots of fixes driven by try jobs. Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/spdy/spdy_test_util_common.cc
diff --git a/net/spdy/spdy_test_util_common.cc b/net/spdy/spdy_test_util_common.cc
index 456a7d161482b8a0838f2856bbe1296854ff3eea..f1fa9b7f73c4ecffbb1cad49ab4dc484e49c3100 100644
--- a/net/spdy/spdy_test_util_common.cc
+++ b/net/spdy/spdy_test_util_common.cc
@@ -387,12 +387,13 @@ SpdySessionDependencies::SpdySessionDependencies(NextProto protocol)
host_resolver->set_synchronous_mode(true);
}
-SpdySessionDependencies::SpdySessionDependencies(NextProto protocol,
- ProxyService* proxy_service)
+SpdySessionDependencies::SpdySessionDependencies(
+ NextProto protocol,
+ scoped_ptr<ProxyService> proxy_service)
: host_resolver(new MockHostResolver),
cert_verifier(new MockCertVerifier),
transport_security_state(new TransportSecurityState),
- proxy_service(proxy_service),
+ proxy_service(proxy_service.Pass()),
ssl_config_service(new SSLConfigServiceDefaults),
socket_factory(new MockClientSocketFactory),
deterministic_socket_factory(new DeterministicMockClientSocketFactory),
@@ -477,15 +478,17 @@ SpdyURLRequestContext::SpdyURLRequestContext(NextProto protocol)
DCHECK(next_proto_is_spdy(protocol)) << "Invalid protocol: " << protocol;
storage_.set_host_resolver(scoped_ptr<HostResolver>(new MockHostResolver));
- storage_.set_cert_verifier(new MockCertVerifier);
- storage_.set_transport_security_state(new TransportSecurityState);
+ storage_.set_cert_verifier(scoped_ptr<CertVerifier>(new MockCertVerifier));
+ storage_.set_transport_security_state(
+ make_scoped_ptr(new TransportSecurityState));
storage_.set_proxy_service(ProxyService::CreateDirect());
storage_.set_ssl_config_service(new SSLConfigServiceDefaults);
- storage_.set_http_auth_handler_factory(HttpAuthHandlerFactory::CreateDefault(
- host_resolver()));
+ storage_.set_http_auth_handler_factory(
+ HttpAuthHandlerFactory::CreateDefault(host_resolver()));
storage_.set_http_server_properties(
scoped_ptr<HttpServerProperties>(new HttpServerPropertiesImpl()));
- storage_.set_job_factory(new URLRequestJobFactoryImpl());
+ storage_.set_job_factory(
+ scoped_ptr<URLRequestJobFactory>(new URLRequestJobFactoryImpl()));
HttpNetworkSession::Params params;
params.client_socket_factory = &socket_factory_;
params.host_resolver = host_resolver();
@@ -503,8 +506,9 @@ SpdyURLRequestContext::SpdyURLRequestContext(NextProto protocol)
new HttpNetworkSession(params));
SpdySessionPoolPeer pool_peer(network_session->spdy_session_pool());
pool_peer.SetEnableSendingInitialData(false);
- storage_.set_http_transaction_factory(new HttpCache(
- network_session.get(), HttpCache::DefaultBackend::InMemory(0)));
+ storage_.set_http_transaction_factory(
+ scoped_ptr<HttpTransactionFactory>(new HttpCache(
+ network_session.get(), HttpCache::DefaultBackend::InMemory(0))));
}
SpdyURLRequestContext::~SpdyURLRequestContext() {

Powered by Google App Engine
This is Rietveld 408576698