Remove static variables from HttpStreamFactory.

net/http/http_network_session.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.
 
 #ifndef NET_HTTP_HTTP_NETWORK_SESSION_H_
 #define NET_HTTP_HTTP_NETWORK_SESSION_H_
 
 #include <set>
 #include "base/memory/ref_counted.h"
 #include "base/threading/non_thread_safe.h"
@@ skipping 44 matching lines @@
     ServerBoundCertService* server_bound_cert_service;
     TransportSecurityState* transport_security_state;
     ProxyService* proxy_service;
     std::string ssl_session_cache_shard;
     SSLConfigService* ssl_config_service;
     HttpAuthHandlerFactory* http_auth_handler_factory;
     NetworkDelegate* network_delegate;
     HttpServerProperties* http_server_properties;
     NetLog* net_log;
     bool force_http_pipelining;
+    bool ignore_certificate_errors;
+    HostMappingRules* host_mapping_rules;

[mmenke, 2012/08/23 18:11:28]

nit:  Please put the HostMappingRules up with the other pointers.

+    bool http_pipelining_enabled;
+    uint16 testing_fixed_http_port;
+    uint16 testing_fixed_https_port;
     std::string trusted_spdy_proxy;
   };
 
   enum SocketPoolType {
     NORMAL_SOCKET_POOL,
     WEBSOCKET_SOCKET_POOL,
     NUM_SOCKET_POOL_TYPES
   };
 
   explicit HttpNetworkSession(const Params& params);
@@ skipping 48 matching lines @@
   base::Value* SpdySessionPoolInfoToValue() const;
 
   void CloseAllConnections();
   void CloseIdleConnections();
 
   bool force_http_pipelining() const { return force_http_pipelining_; }
 
   // Returns the original Params used to construct this session.
   const Params& params() const { return params_; }
 
+  void set_http_pipelining_enabled(bool enable) {
+    params_.http_pipelining_enabled = enable;
+  }
+
  private:
   friend class base::RefCounted<HttpNetworkSession>;
   friend class HttpNetworkSessionPeer;
 
   ~HttpNetworkSession();
 
   ClientSocketPoolManager* GetSocketPoolManager(SocketPoolType pool_type);
 
   NetLog* const net_log_;
   NetworkDelegate* const network_delegate_;
@@ skipping 13 matching lines @@
   SpdySessionPool spdy_session_pool_;
   scoped_ptr<HttpStreamFactory> http_stream_factory_;
   std::set<HttpResponseBodyDrainer*> response_drainers_;
 
   Params params_;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_NETWORK_SESSION_H_