Index: net/http/http_network_session.cc |
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc |
index 6e7ef6692f275dad604740c76d49b52b64a7f33f..d78cab901377e2a011f34217336bcbb5e1b5d3e9 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.server_bound_cert_service, |
@@ -94,7 +94,8 @@ HttpNetworkSession::Params::Params() |
quic_supported_versions.push_back(QUIC_VERSION_16); |
} |
-HttpNetworkSession::Params::~Params() {} |
+HttpNetworkSession::Params::~Params() { |
+} |
// TODO(mbelshe): Move the socket factories into HttpStreamFactory. |
HttpNetworkSession::HttpNetworkSession(const Params& params) |
@@ -110,22 +111,21 @@ HttpNetworkSession::HttpNetworkSession(const Params& params) |
CreateSocketPoolManager(NORMAL_SOCKET_POOL, params)), |
websocket_socket_pool_manager_( |
CreateSocketPoolManager(WEBSOCKET_SOCKET_POOL, params)), |
- quic_stream_factory_(params.host_resolver, |
- params.client_socket_factory ? |
- params.client_socket_factory : |
- net::ClientSocketFactory::GetDefaultFactory(), |
- params.http_server_properties, |
- params.cert_verifier, |
- params.quic_crypto_client_stream_factory, |
- params.quic_random ? params.quic_random : |
- QuicRandom::GetInstance(), |
- params.quic_clock ? params. quic_clock : |
- new QuicClock(), |
- params.quic_max_packet_length, |
- params.quic_supported_versions, |
- params.enable_quic_port_selection, |
- params.enable_quic_pacing, |
- params.enable_quic_time_based_loss_detection), |
+ quic_stream_factory_( |
+ params.host_resolver, |
+ params.client_socket_factory |
+ ? params.client_socket_factory |
+ : net::ClientSocketFactory::GetDefaultFactory(), |
+ params.http_server_properties, |
+ params.cert_verifier, |
+ params.quic_crypto_client_stream_factory, |
+ params.quic_random ? params.quic_random : QuicRandom::GetInstance(), |
+ params.quic_clock ? params.quic_clock : new QuicClock(), |
+ params.quic_max_packet_length, |
+ params.quic_supported_versions, |
+ params.enable_quic_port_selection, |
+ params.enable_quic_pacing, |
+ params.enable_quic_time_based_loss_detection), |
spdy_session_pool_(params.host_resolver, |
params.ssl_config_service, |
params.http_server_properties, |
@@ -139,8 +139,7 @@ HttpNetworkSession::HttpNetworkSession(const Params& params) |
params.time_func, |
params.trusted_spdy_proxy), |
http_stream_factory_(new HttpStreamFactoryImpl(this, false)), |
- http_stream_factory_for_websocket_( |
- new HttpStreamFactoryImpl(this, true)), |
+ http_stream_factory_for_websocket_(new HttpStreamFactoryImpl(this, true)), |
params_(params) { |
DCHECK(proxy_service_); |
DCHECK(ssl_config_service_.get()); |
@@ -180,8 +179,8 @@ SSLClientSocketPool* HttpNetworkSession::GetSSLSocketPool( |
SOCKSClientSocketPool* HttpNetworkSession::GetSocketPoolForSOCKSProxy( |
SocketPoolType pool_type, |
const HostPortPair& socks_proxy) { |
- return GetSocketPoolManager(pool_type)->GetSocketPoolForSOCKSProxy( |
- socks_proxy); |
+ return GetSocketPoolManager(pool_type) |
+ ->GetSocketPoolForSOCKSProxy(socks_proxy); |
} |
HttpProxyClientSocketPool* HttpNetworkSession::GetSocketPoolForHTTPProxy( |
@@ -193,8 +192,8 @@ HttpProxyClientSocketPool* HttpNetworkSession::GetSocketPoolForHTTPProxy( |
SSLClientSocketPool* HttpNetworkSession::GetSocketPoolForSSLWithProxy( |
SocketPoolType pool_type, |
const HostPortPair& proxy_server) { |
- return GetSocketPoolManager(pool_type)->GetSocketPoolForSSLWithProxy( |
- proxy_server); |
+ return GetSocketPoolManager(pool_type) |
+ ->GetSocketPoolForSSLWithProxy(proxy_server); |
} |
base::Value* HttpNetworkSession::SocketPoolInfoToValue() const { |
@@ -213,8 +212,7 @@ base::Value* HttpNetworkSession::QuicInfoToValue() const { |
dict->SetBoolean("quic_enabled_https", params_.enable_quic_https); |
dict->SetBoolean("enable_quic_port_selection", |
params_.enable_quic_port_selection); |
- dict->SetBoolean("enable_quic_pacing", |
- params_.enable_quic_pacing); |
+ dict->SetBoolean("enable_quic_pacing", params_.enable_quic_pacing); |
dict->SetBoolean("enable_quic_time_based_loss_detection", |
params_.enable_quic_time_based_loss_detection); |
dict->SetBoolean("enable_quic_persist_server_info", |