Index: net/spdy/spdy_test_util_spdy3.cc |
diff --git a/net/spdy/spdy_test_util_spdy3.cc b/net/spdy/spdy_test_util_spdy3.cc |
index 508a74b9d501e2e2bcd0db3a356dd6e89ca9197d..1585906684a9c19e259bac606c67187d50be2dbf 100644 |
--- a/net/spdy/spdy_test_util_spdy3.cc |
+++ b/net/spdy/spdy_test_util_spdy3.cc |
@@ -940,7 +940,8 @@ SpdySessionDependencies::SpdySessionDependencies() |
socket_factory(new MockClientSocketFactory), |
deterministic_socket_factory(new DeterministicMockClientSocketFactory), |
http_auth_handler_factory( |
- HttpAuthHandlerFactory::CreateDefault(host_resolver.get())) { |
+ HttpAuthHandlerFactory::CreateDefault(host_resolver.get())), |
+ net_log(NULL) { |
// Note: The CancelledTransaction test does cleanup by running all |
// tasks in the message loop (RunAllPending). Unfortunately, that |
// doesn't clean up tasks on the host resolver thread; and |
@@ -958,24 +959,16 @@ SpdySessionDependencies::SpdySessionDependencies(ProxyService* proxy_service) |
socket_factory(new MockClientSocketFactory), |
deterministic_socket_factory(new DeterministicMockClientSocketFactory), |
http_auth_handler_factory( |
- HttpAuthHandlerFactory::CreateDefault(host_resolver.get())) {} |
+ HttpAuthHandlerFactory::CreateDefault(host_resolver.get())), |
+ net_log(NULL) {} |
SpdySessionDependencies::~SpdySessionDependencies() {} |
// static |
HttpNetworkSession* SpdySessionDependencies::SpdyCreateSession( |
SpdySessionDependencies* session_deps) { |
- net::HttpNetworkSession::Params params; |
+ net::HttpNetworkSession::Params params = CreateSessionParams(session_deps); |
params.client_socket_factory = session_deps->socket_factory.get(); |
- params.host_resolver = session_deps->host_resolver.get(); |
- params.cert_verifier = session_deps->cert_verifier.get(); |
- params.proxy_service = session_deps->proxy_service.get(); |
- params.ssl_config_service = session_deps->ssl_config_service; |
- params.http_auth_handler_factory = |
- session_deps->http_auth_handler_factory.get(); |
- params.http_server_properties = &session_deps->http_server_properties; |
- params.trusted_spdy_proxy = |
- session_deps->trusted_spdy_proxy; |
HttpNetworkSession* http_session = new HttpNetworkSession(params); |
SpdySessionPoolPeer pool_peer(http_session->spdy_session_pool()); |
pool_peer.EnableSendingInitialSettings(false); |
@@ -985,9 +978,19 @@ HttpNetworkSession* SpdySessionDependencies::SpdyCreateSession( |
// static |
HttpNetworkSession* SpdySessionDependencies::SpdyCreateSessionDeterministic( |
SpdySessionDependencies* session_deps) { |
- net::HttpNetworkSession::Params params; |
+ net::HttpNetworkSession::Params params = CreateSessionParams(session_deps); |
params.client_socket_factory = |
session_deps->deterministic_socket_factory.get(); |
+ HttpNetworkSession* http_session = new HttpNetworkSession(params); |
+ SpdySessionPoolPeer pool_peer(http_session->spdy_session_pool()); |
+ pool_peer.EnableSendingInitialSettings(false); |
+ return http_session; |
+} |
+ |
+// static |
+net::HttpNetworkSession::Params SpdySessionDependencies::CreateSessionParams( |
+ SpdySessionDependencies* session_deps) { |
+ net::HttpNetworkSession::Params params; |
params.host_resolver = session_deps->host_resolver.get(); |
params.cert_verifier = session_deps->cert_verifier.get(); |
params.proxy_service = session_deps->proxy_service.get(); |
@@ -995,10 +998,9 @@ HttpNetworkSession* SpdySessionDependencies::SpdyCreateSessionDeterministic( |
params.http_auth_handler_factory = |
session_deps->http_auth_handler_factory.get(); |
params.http_server_properties = &session_deps->http_server_properties; |
- HttpNetworkSession* http_session = new HttpNetworkSession(params); |
- SpdySessionPoolPeer pool_peer(http_session->spdy_session_pool()); |
- pool_peer.EnableSendingInitialSettings(false); |
- return http_session; |
+ params.trusted_spdy_proxy = session_deps->trusted_spdy_proxy; |
+ params.net_log = session_deps->net_log; |
+ return params; |
} |
SpdyURLRequestContext::SpdyURLRequestContext() |