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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/client_socket_pool_manager.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.h ('k') | net/socket/client_socket_pool_manager_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/client_socket_pool_manager.cc
diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
index f81b4bc1db598d528d7bb727c8159eb47fbd09a3..d9b1e01b7c836fdac4374425a25065f5315cb8ba 100644
--- a/net/socket/client_socket_pool_manager.cc
+++ b/net/socket/client_socket_pool_manager.cc
@@ -25,8 +25,8 @@ namespace {
// Limit of sockets of each socket pool.
int g_max_sockets_per_pool[] = {
- 256, // NORMAL_SOCKET_POOL
- 256 // WEBSOCKET_SOCKET_POOL
+ 256, // NORMAL_SOCKET_POOL
+ 256 // WEBSOCKET_SOCKET_POOL
};
COMPILE_ASSERT(arraysize(g_max_sockets_per_pool) ==
@@ -44,8 +44,8 @@ COMPILE_ASSERT(arraysize(g_max_sockets_per_pool) ==
// TODO(yutak): Look at the usage and determine the right value after
// WebSocket protocol stack starts to work.
int g_max_sockets_per_group[] = {
- 6, // NORMAL_SOCKET_POOL
- 30 // WEBSOCKET_SOCKET_POOL
+ 6, // NORMAL_SOCKET_POOL
+ 30 // WEBSOCKET_SOCKET_POOL
};
COMPILE_ASSERT(arraysize(g_max_sockets_per_group) ==
@@ -56,8 +56,8 @@ COMPILE_ASSERT(arraysize(g_max_sockets_per_group) ==
// http and SOCKS proxies. See http://crbug.com/12066 and
// http://crbug.com/44501 for details about proxy server connection limits.
int g_max_sockets_per_proxy_server[] = {
- kDefaultMaxSocketsPerProxyServer, // NORMAL_SOCKET_POOL
- kDefaultMaxSocketsPerProxyServer // WEBSOCKET_SOCKET_POOL
+ kDefaultMaxSocketsPerProxyServer, // NORMAL_SOCKET_POOL
+ kDefaultMaxSocketsPerProxyServer // WEBSOCKET_SOCKET_POOL
};
COMPILE_ASSERT(arraysize(g_max_sockets_per_proxy_server) ==
@@ -90,11 +90,10 @@ int InitSocketPoolHelper(const GURL& request_url,
scoped_ptr<HostPortPair> proxy_host_port;
bool using_ssl = request_url.SchemeIs("https") ||
- request_url.SchemeIs("wss") || force_spdy_over_ssl;
+ request_url.SchemeIs("wss") || force_spdy_over_ssl;
- HostPortPair origin_host_port =
- HostPortPair(request_url.HostNoBrackets(),
- request_url.EffectiveIntPort());
+ HostPortPair origin_host_port = HostPortPair(request_url.HostNoBrackets(),
+ request_url.EffectiveIntPort());
if (!using_ssl && session->params().testing_fixed_http_port != 0) {
origin_host_port.set_port(session->params().testing_fixed_http_port);
@@ -102,10 +101,9 @@ int InitSocketPoolHelper(const GURL& request_url,
origin_host_port.set_port(session->params().testing_fixed_https_port);
}
- bool disable_resolver_cache =
- request_load_flags & LOAD_BYPASS_CACHE ||
- request_load_flags & LOAD_VALIDATE_CACHE ||
- request_load_flags & LOAD_DISABLE_CACHE;
+ bool disable_resolver_cache = request_load_flags & LOAD_BYPASS_CACHE ||
+ request_load_flags & LOAD_VALIDATE_CACHE ||
+ request_load_flags & LOAD_DISABLE_CACHE;
int load_flags = request_load_flags;
if (session->params().ignore_certificate_errors)
@@ -208,9 +206,8 @@ int InitSocketPoolHelper(const GURL& request_url,
connection_group = base::StringPrintf(
"socks%c/%s", socks_version, connection_group.c_str());
- socks_params = new SOCKSSocketParams(proxy_tcp_params,
- socks_version == '5',
- origin_host_port);
+ socks_params = new SOCKSSocketParams(
+ proxy_tcp_params, socks_version == '5', origin_host_port);
}
}
@@ -239,13 +236,19 @@ int InitSocketPoolHelper(const GURL& request_url,
}
if (num_preconnect_streams) {
- RequestSocketsForPool(ssl_pool, connection_group, ssl_params,
- num_preconnect_streams, net_log);
+ RequestSocketsForPool(ssl_pool,
+ connection_group,
+ ssl_params,
+ num_preconnect_streams,
+ net_log);
return OK;
}
- return socket_handle->Init(connection_group, ssl_params,
- request_priority, callback, ssl_pool,
+ return socket_handle->Init(connection_group,
+ ssl_params,
+ request_priority,
+ callback,
+ ssl_pool,
net_log);
}
@@ -255,27 +258,39 @@ int InitSocketPoolHelper(const GURL& request_url,
HttpProxyClientSocketPool* pool =
session->GetSocketPoolForHTTPProxy(socket_pool_type, *proxy_host_port);
if (num_preconnect_streams) {
- RequestSocketsForPool(pool, connection_group, http_proxy_params,
- num_preconnect_streams, net_log);
+ RequestSocketsForPool(pool,
+ connection_group,
+ http_proxy_params,
+ num_preconnect_streams,
+ net_log);
return OK;
}
- return socket_handle->Init(connection_group, http_proxy_params,
- request_priority, callback,
- pool, net_log);
+ return socket_handle->Init(connection_group,
+ http_proxy_params,
+ request_priority,
+ callback,
+ pool,
+ net_log);
}
if (proxy_info.is_socks()) {
SOCKSClientSocketPool* pool =
session->GetSocketPoolForSOCKSProxy(socket_pool_type, *proxy_host_port);
if (num_preconnect_streams) {
- RequestSocketsForPool(pool, connection_group, socks_params,
- num_preconnect_streams, net_log);
+ RequestSocketsForPool(pool,
+ connection_group,
+ socks_params,
+ num_preconnect_streams,
+ net_log);
return OK;
}
- return socket_handle->Init(connection_group, socks_params,
- request_priority, callback, pool,
+ return socket_handle->Init(connection_group,
+ socks_params,
+ request_priority,
+ callback,
+ pool,
net_log);
}
@@ -284,20 +299,21 @@ int InitSocketPoolHelper(const GURL& request_url,
TransportClientSocketPool* pool =
session->GetTransportSocketPool(socket_pool_type);
if (num_preconnect_streams) {
- RequestSocketsForPool(pool, connection_group, tcp_params,
- num_preconnect_streams, net_log);
+ RequestSocketsForPool(
+ pool, connection_group, tcp_params, num_preconnect_streams, net_log);
return OK;
}
- return socket_handle->Init(connection_group, tcp_params,
- request_priority, callback,
- pool, net_log);
+ return socket_handle->Init(
+ connection_group, tcp_params, request_priority, callback, pool, net_log);
}
} // namespace
-ClientSocketPoolManager::ClientSocketPoolManager() {}
-ClientSocketPoolManager::~ClientSocketPoolManager() {}
+ClientSocketPoolManager::ClientSocketPoolManager() {
+}
+ClientSocketPoolManager::~ClientSocketPoolManager() {
+}
// static
int ClientSocketPoolManager::max_sockets_per_pool(
@@ -378,12 +394,24 @@ int InitSocketHandleForHttpRequest(
const OnHostResolutionCallback& resolution_callback,
const CompletionCallback& callback) {
DCHECK(socket_handle);
- return InitSocketPoolHelper(
- request_url, request_extra_headers, request_load_flags, request_priority,
- session, proxy_info, force_spdy_over_ssl, want_spdy_over_npn,
- ssl_config_for_origin, ssl_config_for_proxy, false, privacy_mode, net_log,
- 0, socket_handle, HttpNetworkSession::NORMAL_SOCKET_POOL,
- resolution_callback, callback);
+ return InitSocketPoolHelper(request_url,
+ request_extra_headers,
+ request_load_flags,
+ request_priority,
+ session,
+ proxy_info,
+ force_spdy_over_ssl,
+ want_spdy_over_npn,
+ ssl_config_for_origin,
+ ssl_config_for_proxy,
+ false,
+ privacy_mode,
+ net_log,
+ 0,
+ socket_handle,
+ HttpNetworkSession::NORMAL_SOCKET_POOL,
+ resolution_callback,
+ callback);
}
int InitSocketHandleForWebSocketRequest(
@@ -403,24 +431,35 @@ int InitSocketHandleForWebSocketRequest(
const OnHostResolutionCallback& resolution_callback,
const CompletionCallback& callback) {
DCHECK(socket_handle);
- return InitSocketPoolHelper(
- request_url, request_extra_headers, request_load_flags, request_priority,
- session, proxy_info, force_spdy_over_ssl, want_spdy_over_npn,
- ssl_config_for_origin, ssl_config_for_proxy, true, privacy_mode, net_log,
- 0, socket_handle, HttpNetworkSession::WEBSOCKET_SOCKET_POOL,
- resolution_callback, callback);
+ return InitSocketPoolHelper(request_url,
+ request_extra_headers,
+ request_load_flags,
+ request_priority,
+ session,
+ proxy_info,
+ force_spdy_over_ssl,
+ want_spdy_over_npn,
+ ssl_config_for_origin,
+ ssl_config_for_proxy,
+ true,
+ privacy_mode,
+ net_log,
+ 0,
+ socket_handle,
+ HttpNetworkSession::WEBSOCKET_SOCKET_POOL,
+ resolution_callback,
+ callback);
}
-int InitSocketHandleForRawConnect(
- const HostPortPair& host_port_pair,
- HttpNetworkSession* session,
- const ProxyInfo& proxy_info,
- const SSLConfig& ssl_config_for_origin,
- const SSLConfig& ssl_config_for_proxy,
- PrivacyMode privacy_mode,
- const BoundNetLog& net_log,
- ClientSocketHandle* socket_handle,
- const CompletionCallback& callback) {
+int InitSocketHandleForRawConnect(const HostPortPair& host_port_pair,
+ HttpNetworkSession* session,
+ const ProxyInfo& proxy_info,
+ const SSLConfig& ssl_config_for_origin,
+ const SSLConfig& ssl_config_for_proxy,
+ PrivacyMode privacy_mode,
+ const BoundNetLog& net_log,
+ ClientSocketHandle* socket_handle,
+ const CompletionCallback& callback) {
DCHECK(socket_handle);
// Synthesize an HttpRequestInfo.
GURL request_url = GURL("http://" + host_port_pair.ToString());
@@ -428,24 +467,35 @@ int InitSocketHandleForRawConnect(
int request_load_flags = 0;
RequestPriority request_priority = MEDIUM;
- return InitSocketPoolHelper(
- request_url, request_extra_headers, request_load_flags, request_priority,
- session, proxy_info, false, false, ssl_config_for_origin,
- ssl_config_for_proxy, true, privacy_mode, net_log, 0, socket_handle,
- HttpNetworkSession::NORMAL_SOCKET_POOL, OnHostResolutionCallback(),
- callback);
+ return InitSocketPoolHelper(request_url,
+ request_extra_headers,
+ request_load_flags,
+ request_priority,
+ session,
+ proxy_info,
+ false,
+ false,
+ ssl_config_for_origin,
+ ssl_config_for_proxy,
+ true,
+ privacy_mode,
+ net_log,
+ 0,
+ socket_handle,
+ HttpNetworkSession::NORMAL_SOCKET_POOL,
+ OnHostResolutionCallback(),
+ callback);
}
-int InitSocketHandleForTlsConnect(
- const HostPortPair& host_port_pair,
- HttpNetworkSession* session,
- const ProxyInfo& proxy_info,
- const SSLConfig& ssl_config_for_origin,
- const SSLConfig& ssl_config_for_proxy,
- PrivacyMode privacy_mode,
- const BoundNetLog& net_log,
- ClientSocketHandle* socket_handle,
- const CompletionCallback& callback) {
+int InitSocketHandleForTlsConnect(const HostPortPair& host_port_pair,
+ HttpNetworkSession* session,
+ const ProxyInfo& proxy_info,
+ const SSLConfig& ssl_config_for_origin,
+ const SSLConfig& ssl_config_for_proxy,
+ PrivacyMode privacy_mode,
+ const BoundNetLog& net_log,
+ ClientSocketHandle* socket_handle,
+ const CompletionCallback& callback) {
DCHECK(socket_handle);
// Synthesize an HttpRequestInfo.
GURL request_url = GURL("https://" + host_port_pair.ToString());
@@ -453,12 +503,24 @@ int InitSocketHandleForTlsConnect(
int request_load_flags = 0;
RequestPriority request_priority = MEDIUM;
- return InitSocketPoolHelper(
- request_url, request_extra_headers, request_load_flags, request_priority,
- session, proxy_info, false, false, ssl_config_for_origin,
- ssl_config_for_proxy, true, privacy_mode, net_log, 0, socket_handle,
- HttpNetworkSession::NORMAL_SOCKET_POOL, OnHostResolutionCallback(),
- callback);
+ return InitSocketPoolHelper(request_url,
+ request_extra_headers,
+ request_load_flags,
+ request_priority,
+ session,
+ proxy_info,
+ false,
+ false,
+ ssl_config_for_origin,
+ ssl_config_for_proxy,
+ true,
+ privacy_mode,
+ net_log,
+ 0,
+ socket_handle,
+ HttpNetworkSession::NORMAL_SOCKET_POOL,
+ OnHostResolutionCallback(),
+ callback);
}
int PreconnectSocketsForHttpRequest(
@@ -475,12 +537,24 @@ int PreconnectSocketsForHttpRequest(
PrivacyMode privacy_mode,
const BoundNetLog& net_log,
int num_preconnect_streams) {
- return InitSocketPoolHelper(
- request_url, request_extra_headers, request_load_flags, request_priority,
- session, proxy_info, force_spdy_over_ssl, want_spdy_over_npn,
- ssl_config_for_origin, ssl_config_for_proxy, false, privacy_mode, net_log,
- num_preconnect_streams, NULL, HttpNetworkSession::NORMAL_SOCKET_POOL,
- OnHostResolutionCallback(), CompletionCallback());
+ return InitSocketPoolHelper(request_url,
+ request_extra_headers,
+ request_load_flags,
+ request_priority,
+ session,
+ proxy_info,
+ force_spdy_over_ssl,
+ want_spdy_over_npn,
+ ssl_config_for_origin,
+ ssl_config_for_proxy,
+ false,
+ privacy_mode,
+ net_log,
+ num_preconnect_streams,
+ NULL,
+ HttpNetworkSession::NORMAL_SOCKET_POOL,
+ OnHostResolutionCallback(),
+ CompletionCallback());
}
} // namespace net
« net/base/mime_util_unittest.cc ('K') | « net/socket/client_socket_pool_manager.h ('k') | net/socket/client_socket_pool_manager_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698