Remove static variables from HttpStreamFactory.

chrome/browser/profiles/profile_io_data.cc

Index: chrome/browser/profiles/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index df18869fb8d30bc72f5f868c0b8c646345a5ba1b..078a62117c44829c97939aa1943597ade9fddca4 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -652,3 +652,36 @@ void ProfileIOData::set_server_bound_cert_service(
 void ProfileIOData::DestroyResourceContext() {
   resource_context_.reset();
 }
+
+void ProfileIOData::PopulateNetworkSessionParams(
+    const ProfileParams* profile_params,
+    net::HttpNetworkSession::Params* params) const {
+
+  ChromeURLRequestContext* context = main_request_context();
+
+  IOThread* const io_thread = profile_params->io_thread;
+  IOThread::Globals* const globals = io_thread->globals();
+
+  params->host_resolver = context->host_resolver();
+  params->cert_verifier = context->cert_verifier();
+  params->server_bound_cert_service = context->server_bound_cert_service();
+  params->transport_security_state = context->transport_security_state();
+  params->proxy_service = context->proxy_service();
+  params->ssl_session_cache_shard = GetSSLSessionCacheShard();
+  params->ssl_config_service = context->ssl_config_service();
+  params->http_auth_handler_factory = context->http_auth_handler_factory();
+  params->network_delegate = context->network_delegate();
+  params->http_server_properties = context->http_server_properties();
+  params->net_log = context->net_log();
+  params->host_mapping_rules = globals->host_mapping_rules.get();
+  params->ignore_certificate_errors = globals->ignore_certificate_errors;
+  params->http_pipelining_enabled = globals->http_pipelining_enabled;
+  params->testing_fixed_http_port = globals->testing_fixed_http_port;
+  params->testing_fixed_https_port = globals->testing_fixed_https_port;
+
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  if (command_line.HasSwitch(switches::kTrustedSpdyProxy)) {
+    params->trusted_spdy_proxy = command_line.GetSwitchValueASCII(
+        switches::kTrustedSpdyProxy);
+  }
+}