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

Unified Diff: net/socket/ssl_client_socket_pool_unittest.cc

Issue 2041863002: Remove HttpServerProperies::GetWeakPtr(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 6 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
« no previous file with comments | « net/quic/quic_stream_factory_test.cc ('k') | net/spdy/spdy_network_transaction_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_pool_unittest.cc
diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc
index f3caaf544cde0c7a645faab860860c2919c9bea8..92e0407130bfca4e278382dd4a5cc554873361a8 100644
--- a/net/socket/ssl_client_socket_pool_unittest.cc
+++ b/net/socket/ssl_client_socket_pool_unittest.cc
@@ -83,6 +83,7 @@ class SSLClientSocketPoolTest
ssl_config_service_(new SSLConfigServiceDefaults),
http_auth_handler_factory_(
HttpAuthHandlerFactory::CreateDefault(&host_resolver_)),
+ http_server_properties_(new HttpServerPropertiesImpl),
session_(CreateNetworkSession()),
direct_transport_socket_params_(new TransportSocketParams(
HostPortPair("host", 443),
@@ -166,8 +167,7 @@ class SSLClientSocketPoolTest
params.client_socket_factory = &socket_factory_;
params.ssl_config_service = ssl_config_service_.get();
params.http_auth_handler_factory = http_auth_handler_factory_.get();
- params.http_server_properties =
- http_server_properties_.GetWeakPtr();
+ params.http_server_properties = http_server_properties_.get();
params.spdy_default_protocol = GetParam();
return new HttpNetworkSession(params);
}
@@ -181,7 +181,7 @@ class SSLClientSocketPoolTest
const std::unique_ptr<ProxyService> proxy_service_;
const scoped_refptr<SSLConfigService> ssl_config_service_;
const std::unique_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_;
- HttpServerPropertiesImpl http_server_properties_;
+ const std::unique_ptr<HttpServerPropertiesImpl> http_server_properties_;
const std::unique_ptr<HttpNetworkSession> session_;
scoped_refptr<TransportSocketParams> direct_transport_socket_params_;
« no previous file with comments | « net/quic/quic_stream_factory_test.cc ('k') | net/spdy/spdy_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698