Remove static variables from HttpStreamFactory.

net/url_request/url_request_context_builder.h

 // 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.
 
 // This class is useful for building a simple URLRequestContext. Most creators
 // of new URLRequestContexts should use this helper class to construct it. Call
 // any configuration params, and when done, invoke Build() to construct the
 // URLRequestContext. This URLRequestContext will own all its own storage.
 //
 // URLRequestContextBuilder and its associated params classes are initially
 // populated with "sane" default values. Read through the comments to figure out
 // what these are.
 
 #ifndef NET_URL_REQUEST_URL_REQUEST_CONTEXT_BUILDER_H_
 #define NET_URL_REQUEST_URL_REQUEST_CONTEXT_BUILDER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
 #include "net/base/net_export.h"
 
 namespace net {
 
+class HostMappingRules;
 class ProxyConfigService;
 class URLRequestContext;
 
 class NET_EXPORT URLRequestContextBuilder {
  public:
   struct NET_EXPORT HostResolverParams {
     HostResolverParams();
     ~HostResolverParams();
 
     // The limit on the number of parallel host resolutions.
@@ skipping 17 matching lines @@
     Type type;
 
     // The max size of the cache in bytes. Default is algorithmically determined
     // based off available disk space.
     int max_size;
 
     // The cache path (when type is DISK).
     FilePath path;
   };
 
+  struct NET_EXPORT HttpNetworkSessionParams {
+    HttpNetworkSessionParams();
+    ~HttpNetworkSessionParams();
+
+    // These fields mirror those in net::HttpNetworkSession::Params;
+    bool ignore_certificate_errors;
+    HostMappingRules* host_mapping_rules;
+    bool http_pipelining_enabled;
+    uint16 testing_fixed_http_port;
+    uint16 testing_fixed_https_port;
+    std::string trusted_spdy_proxy;
+  };
+
   URLRequestContextBuilder();
   ~URLRequestContextBuilder();
 
 #if defined(OS_LINUX)
   void set_proxy_config_service(ProxyConfigService* proxy_config_service);
 #endif  // defined(OS_LINUX)
 
   // Call this function to specify a hard-coded User-Agent for all requests that
   // don't have a User-Agent already set.
   void set_user_agent(const std::string& user_agent) {
     user_agent_ = user_agent;
   }
 
   // Allows for overriding the default HostResolver params.
   void set_host_resolver_params(
       const HostResolverParams& host_resolver_params) {
     host_resolver_params_ = host_resolver_params;
   }
 
   // By default it's disabled.
   void set_ftp_enabled(bool enable) {
     ftp_enabled_ = enable;
   }
 
   // By default HttpCache is enabled with a default constructed HttpCacheParams.
   void EnableHttpCache(const HttpCacheParams& params);
   void DisableHttpCache();
 
+  // Override default net::HttpNetworkSession::Params settings.
+  void set_http_network_session_params(
+      const HttpNetworkSessionParams& http_network_session_params) {
+    http_network_session_params_ = http_network_session_params;
+  }
+
   URLRequestContext* Build();
 
  private:
   std::string user_agent_;
   bool ftp_enabled_;
   HostResolverParams host_resolver_params_;
   bool http_cache_enabled_;
   HttpCacheParams http_cache_params_;
+  HttpNetworkSessionParams http_network_session_params_;
 #if defined(OS_LINUX)
   scoped_ptr<ProxyConfigService> proxy_config_service_;
 #endif  // defined(OS_LINUX)
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestContextBuilder);
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_CONTEXT_BUILDER_H_