Remove static variables from HttpStreamFactory.

chrome/browser/profiles/profile_impl_io_data.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/profile_impl_io_data.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 398 matching lines @@
   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;
+  network_session_params.host_resolver = main_context->host_resolver();
+  network_session_params.cert_verifier = main_context->cert_verifier();
+  network_session_params.server_bound_cert_service =
+      main_context->server_bound_cert_service();
+  network_session_params.transport_security_state =
+      main_context->transport_security_state();
+  network_session_params.proxy_service = main_context->proxy_service();
+  network_session_params.ssl_session_cache_shard =
+      GetSSLSessionCacheShard();
+  network_session_params.ssl_config_service =
+      main_context->ssl_config_service();
+  network_session_params.http_auth_handler_factory =
+      main_context->http_auth_handler_factory();
+  network_session_params.network_delegate =
+      main_context->network_delegate();
+  network_session_params.http_server_properties =
+      main_context->http_server_properties();
+  network_session_params.net_log = main_context->net_log();
+  network_session_params.ignore_certificate_errors =
+      io_thread_globals->ignore_certificate_errors;
+  network_session_params.host_mapping_rules =
+      io_thread_globals->host_mapping_rules.get();
+  network_session_params.http_pipelining_enabled =
+      io_thread_globals->http_pipelining_enabled;
+  network_session_params.testing_fixed_http_port =
+      io_thread_globals->testing_fixed_http_port;
+  network_session_params.testing_fixed_https_port =
+      io_thread_globals->testing_fixed_https_port;
+  network_session_params.trusted_spdy_proxy = trusted_spdy_proxy;
+
   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(
         record_mode ? net::HttpCache::RECORD : net::HttpCache::PLAYBACK);
   }
 
   main_http_factory_.reset(main_cache);
   main_context->set_http_transaction_factory(main_cache);
 
   ftp_factory_.reset(
@@ skipping 224 matching lines @@
 void ProfileImplIOData::ClearNetworkingHistorySinceOnIOThread(
     base::Time time) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   LazyInitialize();
 
   DCHECK(transport_security_state());
   transport_security_state()->DeleteSince(time);
   DCHECK(http_server_properties_manager());
   http_server_properties_manager()->Clear();
 }