summaryrefslogtreecommitdiffstats
path: root/net/socket/client_socket_pool_manager.cc
diff options
context:
space:
mode:
authormef@chromium.org <mef@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-17 05:23:36 +0000
committermef@chromium.org <mef@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-17 05:23:36 +0000
commit5e5021ad0aaf3680f9ddee6da37669758227f15c (patch)
tree6356894b0feea7ddf5f2cce3e2f964b1a02c4b2a /net/socket/client_socket_pool_manager.cc
parent2ea1efe9660ee70c8eefb98dde76caac1c918005 (diff)
downloadchromium_src-5e5021ad0aaf3680f9ddee6da37669758227f15c.zip
chromium_src-5e5021ad0aaf3680f9ddee6da37669758227f15c.tar.gz
chromium_src-5e5021ad0aaf3680f9ddee6da37669758227f15c.tar.bz2
HTTP socket pool group name and SSL Session Cache Shard vary on Privacy Mode.
BUG=223191 Review URL: https://chromiumcodereview.appspot.com/15896032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211951 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/client_socket_pool_manager.cc')
-rw-r--r--net/socket/client_socket_pool_manager.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
index 9282901..71496d2 100644
--- a/net/socket/client_socket_pool_manager.cc
+++ b/net/socket/client_socket_pool_manager.cc
@@ -185,6 +185,7 @@ int InitSocketPoolHelper(const GURL& request_url,
ProxyServer::SCHEME_DIRECT,
*proxy_host_port.get(),
ssl_config_for_proxy,
+ kPrivacyModeDisabled,
load_flags,
force_spdy_over_ssl,
want_spdy_over_npn);
@@ -218,6 +219,10 @@ int InitSocketPoolHelper(const GURL& request_url,
}
}
+ // Change group name if privacy mode is enabled.
+ if (privacy_mode == kPrivacyModeEnabled)
+ connection_group = "pm/" + connection_group;
+
// Deal with SSL - which layers on top of any given proxy.
if (using_ssl) {
scoped_refptr<SSLSocketParams> ssl_params =
@@ -227,13 +232,10 @@ int InitSocketPoolHelper(const GURL& request_url,
proxy_info.proxy_server().scheme(),
origin_host_port,
ssl_config_for_origin,
+ privacy_mode,
load_flags,
force_spdy_over_ssl,
want_spdy_over_npn);
- // Change group name if privacy mode is enabled.
- if (privacy_mode == kPrivacyModeEnabled)
- connection_group = "pm/" + connection_group;
-
SSLClientSocketPool* ssl_pool = NULL;
if (proxy_info.is_direct()) {
ssl_pool = session->GetSSLSocketPool(socket_pool_type);