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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/client_socket_pool_manager_impl.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
« net/base/mime_util_unittest.cc ('K') | « net/socket/client_socket_pool_manager_impl.h ('k') | net/socket/deterministic_socket_data_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/client_socket_pool_manager_impl.cc
diff --git a/net/socket/client_socket_pool_manager_impl.cc b/net/socket/client_socket_pool_manager_impl.cc
index 991278d7341c55bb758be8a88c70b7903c1d81c8..a7cfe14057e954380e88e35215f32e6d55a953e6 100644
--- a/net/socket/client_socket_pool_manager_impl.cc
+++ b/net/socket/client_socket_pool_manager_impl.cc
@@ -24,10 +24,10 @@ void AddSocketPoolsToList(base::ListValue* list,
const std::string& type,
bool include_nested_pools) {
for (typename MapType::const_iterator it = socket_pools.begin();
- it != socket_pools.end(); it++) {
- list->Append(it->second->GetInfoAsValue(it->first.ToString(),
- type,
- include_nested_pools));
+ it != socket_pools.end();
+ it++) {
+ list->Append(it->second->GetInfoAsValue(
+ it->first.ToString(), type, include_nested_pools));
}
}
@@ -57,28 +57,29 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl(
ssl_config_service_(ssl_config_service),
pool_type_(pool_type),
transport_pool_histograms_("TCP"),
- transport_socket_pool_(new TransportClientSocketPool(
- max_sockets_per_pool(pool_type), max_sockets_per_group(pool_type),
- &transport_pool_histograms_,
- host_resolver,
- socket_factory_,
- net_log)),
+ transport_socket_pool_(
+ new TransportClientSocketPool(max_sockets_per_pool(pool_type),
+ max_sockets_per_group(pool_type),
+ &transport_pool_histograms_,
+ host_resolver,
+ socket_factory_,
+ net_log)),
ssl_pool_histograms_("SSL2"),
- ssl_socket_pool_(new SSLClientSocketPool(
- max_sockets_per_pool(pool_type), max_sockets_per_group(pool_type),
- &ssl_pool_histograms_,
- host_resolver,
- cert_verifier,
- server_bound_cert_service,
- transport_security_state,
- cert_transparency_verifier,
- ssl_session_cache_shard,
- socket_factory,
- transport_socket_pool_.get(),
- NULL /* no socks proxy */,
- NULL /* no http proxy */,
- ssl_config_service,
- net_log)),
+ ssl_socket_pool_(new SSLClientSocketPool(max_sockets_per_pool(pool_type),
+ max_sockets_per_group(pool_type),
+ &ssl_pool_histograms_,
+ host_resolver,
+ cert_verifier,
+ server_bound_cert_service,
+ transport_security_state,
+ cert_transparency_verifier,
+ ssl_session_cache_shard,
+ socket_factory,
+ transport_socket_pool_.get(),
+ NULL /* no socks proxy */,
+ NULL /* no http proxy */,
+ ssl_config_service,
+ net_log)),
transport_for_socks_pool_histograms_("TCPforSOCKS"),
socks_pool_histograms_("SOCK"),
transport_for_http_proxy_pool_histograms_("TCPforHTTPProxy"),
@@ -98,43 +99,42 @@ void ClientSocketPoolManagerImpl::FlushSocketPoolsWithError(int error) {
// stuff to the lower level pools.
for (SSLSocketPoolMap::const_iterator it =
- ssl_socket_pools_for_proxies_.begin();
+ ssl_socket_pools_for_proxies_.begin();
it != ssl_socket_pools_for_proxies_.end();
++it)
it->second->FlushWithError(error);
for (HTTPProxySocketPoolMap::const_iterator it =
- http_proxy_socket_pools_.begin();
+ http_proxy_socket_pools_.begin();
it != http_proxy_socket_pools_.end();
++it)
it->second->FlushWithError(error);
for (SSLSocketPoolMap::const_iterator it =
- ssl_socket_pools_for_https_proxies_.begin();
+ ssl_socket_pools_for_https_proxies_.begin();
it != ssl_socket_pools_for_https_proxies_.end();
++it)
it->second->FlushWithError(error);
for (TransportSocketPoolMap::const_iterator it =
- transport_socket_pools_for_https_proxies_.begin();
+ transport_socket_pools_for_https_proxies_.begin();
it != transport_socket_pools_for_https_proxies_.end();
++it)
it->second->FlushWithError(error);
for (TransportSocketPoolMap::const_iterator it =
- transport_socket_pools_for_http_proxies_.begin();
+ transport_socket_pools_for_http_proxies_.begin();
it != transport_socket_pools_for_http_proxies_.end();
++it)
it->second->FlushWithError(error);
- for (SOCKSSocketPoolMap::const_iterator it =
- socks_socket_pools_.begin();
+ for (SOCKSSocketPoolMap::const_iterator it = socks_socket_pools_.begin();
it != socks_socket_pools_.end();
++it)
it->second->FlushWithError(error);
for (TransportSocketPoolMap::const_iterator it =
- transport_socket_pools_for_socks_proxies_.begin();
+ transport_socket_pools_for_socks_proxies_.begin();
it != transport_socket_pools_for_socks_proxies_.end();
++it)
it->second->FlushWithError(error);
@@ -147,43 +147,42 @@ void ClientSocketPoolManagerImpl::CloseIdleSockets() {
// Close sockets in the highest level pools first, since higher level pools'
// sockets may release stuff to the lower level pools.
for (SSLSocketPoolMap::const_iterator it =
- ssl_socket_pools_for_proxies_.begin();
+ ssl_socket_pools_for_proxies_.begin();
it != ssl_socket_pools_for_proxies_.end();
++it)
it->second->CloseIdleSockets();
for (HTTPProxySocketPoolMap::const_iterator it =
- http_proxy_socket_pools_.begin();
+ http_proxy_socket_pools_.begin();
it != http_proxy_socket_pools_.end();
++it)
it->second->CloseIdleSockets();
for (SSLSocketPoolMap::const_iterator it =
- ssl_socket_pools_for_https_proxies_.begin();
+ ssl_socket_pools_for_https_proxies_.begin();
it != ssl_socket_pools_for_https_proxies_.end();
++it)
it->second->CloseIdleSockets();
for (TransportSocketPoolMap::const_iterator it =
- transport_socket_pools_for_https_proxies_.begin();
+ transport_socket_pools_for_https_proxies_.begin();
it != transport_socket_pools_for_https_proxies_.end();
++it)
it->second->CloseIdleSockets();
for (TransportSocketPoolMap::const_iterator it =
- transport_socket_pools_for_http_proxies_.begin();
+ transport_socket_pools_for_http_proxies_.begin();
it != transport_socket_pools_for_http_proxies_.end();
++it)
it->second->CloseIdleSockets();
- for (SOCKSSocketPoolMap::const_iterator it =
- socks_socket_pools_.begin();
+ for (SOCKSSocketPoolMap::const_iterator it = socks_socket_pools_.begin();
it != socks_socket_pools_.end();
++it)
it->second->CloseIdleSockets();
for (TransportSocketPoolMap::const_iterator it =
- transport_socket_pools_for_socks_proxies_.begin();
+ transport_socket_pools_for_socks_proxies_.begin();
it != transport_socket_pools_for_socks_proxies_.end();
++it)
it->second->CloseIdleSockets();
@@ -213,26 +212,25 @@ SOCKSClientSocketPool* ClientSocketPoolManagerImpl::GetSocketPoolForSOCKSProxy(
std::pair<TransportSocketPoolMap::iterator, bool> tcp_ret =
transport_socket_pools_for_socks_proxies_.insert(
- std::make_pair(
- socks_proxy,
- new TransportClientSocketPool(
- max_sockets_per_proxy_server(pool_type_),
- max_sockets_per_group(pool_type_),
- &transport_for_socks_pool_histograms_,
- host_resolver_,
- socket_factory_,
- net_log_)));
+ std::make_pair(socks_proxy,
+ new TransportClientSocketPool(
+ max_sockets_per_proxy_server(pool_type_),
+ max_sockets_per_group(pool_type_),
+ &transport_for_socks_pool_histograms_,
+ host_resolver_,
+ socket_factory_,
+ net_log_)));
DCHECK(tcp_ret.second);
std::pair<SOCKSSocketPoolMap::iterator, bool> ret =
- socks_socket_pools_.insert(
- std::make_pair(socks_proxy, new SOCKSClientSocketPool(
- max_sockets_per_proxy_server(pool_type_),
- max_sockets_per_group(pool_type_),
- &socks_pool_histograms_,
- host_resolver_,
- tcp_ret.first->second,
- net_log_)));
+ socks_socket_pools_.insert(std::make_pair(
+ socks_proxy,
+ new SOCKSClientSocketPool(max_sockets_per_proxy_server(pool_type_),
+ max_sockets_per_group(pool_type_),
+ &socks_pool_histograms_,
+ host_resolver_,
+ tcp_ret.first->second,
+ net_log_)));
return ret.first->second;
}
@@ -255,28 +253,26 @@ ClientSocketPoolManagerImpl::GetSocketPoolForHTTPProxy(
std::pair<TransportSocketPoolMap::iterator, bool> tcp_http_ret =
transport_socket_pools_for_http_proxies_.insert(
- std::make_pair(
- http_proxy,
- new TransportClientSocketPool(
- max_sockets_per_proxy_server(pool_type_),
- max_sockets_per_group(pool_type_),
- &transport_for_http_proxy_pool_histograms_,
- host_resolver_,
- socket_factory_,
- net_log_)));
+ std::make_pair(http_proxy,
+ new TransportClientSocketPool(
+ max_sockets_per_proxy_server(pool_type_),
+ max_sockets_per_group(pool_type_),
+ &transport_for_http_proxy_pool_histograms_,
+ host_resolver_,
+ socket_factory_,
+ net_log_)));
DCHECK(tcp_http_ret.second);
std::pair<TransportSocketPoolMap::iterator, bool> tcp_https_ret =
transport_socket_pools_for_https_proxies_.insert(
- std::make_pair(
- http_proxy,
- new TransportClientSocketPool(
- max_sockets_per_proxy_server(pool_type_),
- max_sockets_per_group(pool_type_),
- &transport_for_https_proxy_pool_histograms_,
- host_resolver_,
- socket_factory_,
- net_log_)));
+ std::make_pair(http_proxy,
+ new TransportClientSocketPool(
+ max_sockets_per_proxy_server(pool_type_),
+ max_sockets_per_group(pool_type_),
+ &transport_for_https_proxy_pool_histograms_,
+ host_resolver_,
+ socket_factory_,
+ net_log_)));
DCHECK(tcp_https_ret.second);
std::pair<SSLSocketPoolMap::iterator, bool> ssl_https_ret =
@@ -301,16 +297,15 @@ ClientSocketPoolManagerImpl::GetSocketPoolForHTTPProxy(
std::pair<HTTPProxySocketPoolMap::iterator, bool> ret =
http_proxy_socket_pools_.insert(
- std::make_pair(
- http_proxy,
- new HttpProxyClientSocketPool(
- max_sockets_per_proxy_server(pool_type_),
- max_sockets_per_group(pool_type_),
- &http_proxy_pool_histograms_,
- host_resolver_,
- tcp_http_ret.first->second,
- ssl_https_ret.first->second,
- net_log_)));
+ std::make_pair(http_proxy,
+ new HttpProxyClientSocketPool(
+ max_sockets_per_proxy_server(pool_type_),
+ max_sockets_per_group(pool_type_),
+ &http_proxy_pool_histograms_,
+ host_resolver_,
+ tcp_http_ret.first->second,
+ ssl_https_ret.first->second,
+ net_log_)));
return ret.first->second;
}
@@ -340,31 +335,24 @@ SSLClientSocketPool* ClientSocketPoolManagerImpl::GetSocketPoolForSSLWithProxy(
net_log_);
std::pair<SSLSocketPoolMap::iterator, bool> ret =
- ssl_socket_pools_for_proxies_.insert(std::make_pair(proxy_server,
- new_pool));
+ ssl_socket_pools_for_proxies_.insert(
+ std::make_pair(proxy_server, new_pool));
return ret.first->second;
}
base::Value* ClientSocketPoolManagerImpl::SocketPoolInfoToValue() const {
base::ListValue* list = new base::ListValue();
- list->Append(transport_socket_pool_->GetInfoAsValue("transport_socket_pool",
- "transport_socket_pool",
- false));
+ list->Append(transport_socket_pool_->GetInfoAsValue(
+ "transport_socket_pool", "transport_socket_pool", false));
// Third parameter is false because |ssl_socket_pool_| uses
// |transport_socket_pool_| internally, and do not want to add it a second
// time.
- list->Append(ssl_socket_pool_->GetInfoAsValue("ssl_socket_pool",
- "ssl_socket_pool",
- false));
- AddSocketPoolsToList(list,
- http_proxy_socket_pools_,
- "http_proxy_socket_pool",
- true);
- AddSocketPoolsToList(list,
- socks_socket_pools_,
- "socks_socket_pool",
- true);
+ list->Append(ssl_socket_pool_->GetInfoAsValue(
+ "ssl_socket_pool", "ssl_socket_pool", false));
+ AddSocketPoolsToList(
+ list, http_proxy_socket_pools_, "http_proxy_socket_pool", true);
+ AddSocketPoolsToList(list, socks_socket_pools_, "socks_socket_pool", true);
// Third parameter is false because |ssl_socket_pools_for_proxies_| use
// socket pools in |http_proxy_socket_pools_| and |socks_socket_pools_|.
@@ -379,8 +367,7 @@ void ClientSocketPoolManagerImpl::OnCertAdded(const X509Certificate* cert) {
FlushSocketPoolsWithError(ERR_NETWORK_CHANGED);
}
-void ClientSocketPoolManagerImpl::OnCACertChanged(
- const X509Certificate* cert) {
+void ClientSocketPoolManagerImpl::OnCACertChanged(const X509Certificate* cert) {
// We should flush the socket pools if we removed trust from a
// cert, because a previously trusted server may have become
// untrusted.
« net/base/mime_util_unittest.cc ('K') | « net/socket/client_socket_pool_manager_impl.h ('k') | net/socket/deterministic_socket_data_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698