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 b7de713eaa30d1b12dc33f8f259038a10be4e1e3..1b6faa4c309425b823a009d68eb9e15d3d6c1158 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(
+      net::HttpNetworkSession::Params& params,
+      const ProfileParams* profile_params) const {

[mmenke, 2012/09/04 21:11:06]

Nico is right that params should be a pointer.  Also, profile_params should be
the first argument - input params should go before output params.

+
+  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);
+  }
+}