Remove static variables from HttpStreamFactory.

net/socket/client_socket_pool_manager.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 "net/socket/client_socket_pool_manager.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 75 matching lines @@
   scoped_refptr<HttpProxySocketParams> http_proxy_params;
   scoped_refptr<SOCKSSocketParams> socks_params;
   scoped_ptr<HostPortPair> proxy_host_port;
 
   bool using_ssl = request_url.SchemeIs("https") || force_spdy_over_ssl;
 
   HostPortPair origin_host_port =
       HostPortPair(request_url.HostNoBrackets(),
                    request_url.EffectiveIntPort());
 
-  if (!using_ssl && HttpStreamFactory::testing_fixed_http_port() != 0) {
-    origin_host_port.set_port(HttpStreamFactory::testing_fixed_http_port());
-  } else if (using_ssl && HttpStreamFactory::testing_fixed_https_port() != 0) {
-    origin_host_port.set_port(HttpStreamFactory::testing_fixed_https_port());
+  if (!using_ssl && session->params().testing_fixed_http_port != 0) {
+    origin_host_port.set_port(session->params().testing_fixed_http_port);
+  } else if (using_ssl && session->params().testing_fixed_https_port != 0) {
+    origin_host_port.set_port(session->params().testing_fixed_https_port);
   }
 
   bool disable_resolver_cache =
       request_load_flags & LOAD_BYPASS_CACHE ||
       request_load_flags & LOAD_VALIDATE_CACHE ||
       request_load_flags & LOAD_DISABLE_CACHE;
 
   int load_flags = request_load_flags;
-  if (HttpStreamFactory::ignore_certificate_errors())
+  if (session->params().ignore_certificate_errors)
     load_flags |= LOAD_IGNORE_ALL_CERT_ERRORS;
 
   // Build the string used to uniquely identify connections of this type.
   // Determine the host and port to connect to.
   std::string connection_group = origin_host_port.ToString();
   DCHECK(!connection_group.empty());
   if (using_ssl) {
     // All connections in a group should use the same SSLConfig settings.
     // Encode version_max in the connection group's name, unless it's the
     // default version_max. (We want the common case to use the shortest
@@ skipping 300 matching lines @@
     int num_preconnect_streams) {
   return InitSocketPoolHelper(
       request_url, request_extra_headers, request_load_flags, request_priority,
       session, proxy_info, force_spdy_over_ssl, want_spdy_over_npn,
       ssl_config_for_origin, ssl_config_for_proxy, false, net_log,
       num_preconnect_streams, NULL, OnHostResolutionCallback(),
       CompletionCallback());
 }
 
 }  // namespace net