summaryrefslogtreecommitdiffstats
path: root/net/http/http_cache.cc
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-12 22:22:19 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-12 22:22:19 +0000
commitc3456bbc289c54765e89d628ba03505425fe372a (patch)
tree7d027edc8ea0a358bd5dcfb227fbc48ea8ca26ab /net/http/http_cache.cc
parent9b10d2a051ec36c4e7f012d31b8214221db16eaa (diff)
downloadchromium_src-c3456bbc289c54765e89d628ba03505425fe372a.zip
chromium_src-c3456bbc289c54765e89d628ba03505425fe372a.tar.gz
chromium_src-c3456bbc289c54765e89d628ba03505425fe372a.tar.bz2
net: split the SSL session cache between incognito and normal.
This change causes incognito requests to effectively have a different SSL session cache from other requests. SSL session information will therefore not leak into or out of incognito mode. BUG=30877 TEST=net_unittests Review URL: http://codereview.chromium.org/8857002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114098 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_cache.cc')
-rw-r--r--net/http/http_cache.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index 4aa37fa..8d79918 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -49,6 +49,7 @@ HttpNetworkSession* CreateNetworkSession(
DnsCertProvenanceChecker* dns_cert_checker,
ProxyService* proxy_service,
SSLHostInfoFactory* ssl_host_info_factory,
+ const std::string& ssl_session_cache_shard,
SSLConfigService* ssl_config_service,
HttpAuthHandlerFactory* http_auth_handler_factory,
NetworkDelegate* network_delegate,
@@ -62,6 +63,7 @@ HttpNetworkSession* CreateNetworkSession(
params.dns_cert_checker = dns_cert_checker;
params.proxy_service = proxy_service;
params.ssl_host_info_factory = ssl_host_info_factory;
+ params.ssl_session_cache_shard = ssl_session_cache_shard;
params.ssl_config_service = ssl_config_service;
params.http_auth_handler_factory = http_auth_handler_factory;
params.network_delegate = network_delegate;
@@ -321,6 +323,7 @@ HttpCache::HttpCache(HostResolver* host_resolver,
TransportSecurityState* transport_security_state,
DnsCertProvenanceChecker* dns_cert_checker_,
ProxyService* proxy_service,
+ const std::string& ssl_session_cache_shard,
SSLConfigService* ssl_config_service,
HttpAuthHandlerFactory* http_auth_handler_factory,
NetworkDelegate* network_delegate,
@@ -344,6 +347,7 @@ HttpCache::HttpCache(HostResolver* host_resolver,
dns_cert_checker_,
proxy_service,
ssl_host_info_factory_.get(),
+ ssl_session_cache_shard,
ssl_config_service,
http_auth_handler_factory,
network_delegate,