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

Unified Diff: net/http/http_network_session.cc

Issue 353713005: Implements new, more robust design for communicating between SSLConnectJobs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed typo & removed CapturingNetLog arg. Created 6 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/http/http_network_session.cc
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index 43613e28f70c776fac2ca72130fcccd6e036f8d8..52415ab21baf351ec31a83d719361949846e52d1 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -36,9 +36,9 @@ net::ClientSocketPoolManager* CreateSocketPoolManager(
// simultaneous connections for WebSockets.
return new net::ClientSocketPoolManagerImpl(
params.net_log,
- params.client_socket_factory ?
- params.client_socket_factory :
- net::ClientSocketFactory::GetDefaultFactory(),
+ params.client_socket_factory
+ ? params.client_socket_factory
+ : net::ClientSocketFactory::GetDefaultFactory(),
params.host_resolver,
params.cert_verifier,
params.channel_id_service,
@@ -47,6 +47,7 @@ net::ClientSocketPoolManager* CreateSocketPoolManager(
params.ssl_session_cache_shard,
params.proxy_service,
params.ssl_config_service,
+ params.enable_ssl_connect_job_waiting,
pool_type);
}

Powered by Google App Engine
This is Rietveld 408576698