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

Unified Diff: chrome/browser/profiles/profile_impl_io_data.cc

Issue 10834215: Remove static variables from HttpStreamFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: typo Created 8 years, 3 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
Index: chrome/browser/profiles/profile_impl_io_data.cc
diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc
index d7ca58340c541d10b5f818cbb6a69948a30cdc60..ed86c631b6fc201956ee4dc25cfaeaec2354d119 100644
--- a/chrome/browser/profiles/profile_impl_io_data.cc
+++ b/chrome/browser/profiles/profile_impl_io_data.cc
@@ -406,31 +406,16 @@ void ProfileImplIOData::LazyInitializeInternal(
set_server_bound_cert_service(server_bound_cert_service);
main_context->set_server_bound_cert_service(server_bound_cert_service);
- std::string trusted_spdy_proxy;
- if (command_line.HasSwitch(switches::kTrustedSpdyProxy)) {
- trusted_spdy_proxy = command_line.GetSwitchValueASCII(
- switches::kTrustedSpdyProxy);
- }
net::HttpCache::DefaultBackend* main_backend =
new net::HttpCache::DefaultBackend(
net::DISK_CACHE,
lazy_params_->cache_path,
lazy_params_->cache_max_size,
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE));
+ net::HttpNetworkSession::Params network_session_params;
+ PopulateNetworkSessionParams(profile_params, &network_session_params);
net::HttpCache* main_cache = new net::HttpCache(
- main_context->host_resolver(),
- main_context->cert_verifier(),
- main_context->server_bound_cert_service(),
- main_context->transport_security_state(),
- main_context->proxy_service(),
- GetSSLSessionCacheShard(),
- main_context->ssl_config_service(),
- main_context->http_auth_handler_factory(),
- main_context->network_delegate(),
- main_context->http_server_properties(),
- main_context->net_log(),
- main_backend,
- trusted_spdy_proxy);
+ network_session_params, main_backend);
if (record_mode || playback_mode) {
main_cache->set_mode(
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_io_data.cc ('k') | chrome/browser/profiles/profile_io_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698