Remove static variables from HttpStreamFactory.

net/http/http_stream_factory.h

Index: net/http/http_stream_factory.h
diff --git a/net/http/http_stream_factory.h b/net/http/http_stream_factory.h
index df9cecf896bef025b0e66532e3e32fdd69e6f058..73710100a861a1753675324659092a5e0b91735b 100644
--- a/net/http/http_stream_factory.h
+++ b/net/http/http_stream_factory.h
@@ -163,6 +163,8 @@ class NET_EXPORT HttpStreamFactory {
       const std::string& alternate_protocol_str,
       const HostPortPair& http_host_port_pair);
 
+  GURL ApplyHostMappingRules(const GURL& url, HostPortPair* endpoint);
+
   // Virtual interface methods.
 
   // Request a stream.
@@ -185,13 +187,13 @@ class NET_EXPORT HttpStreamFactory {
   // returns an empty Value.
   virtual base::Value* PipelineInfoToValue() const = 0;
 
+  virtual const HostMappingRules* GetHostMappingRules() const = 0;
+
   // Static settings
 
   // Reset all static settings to initialized values. Used to init test suite.
   static void ResetStaticSettingsToInit();
 
-  static GURL ApplyHostMappingRules(const GURL& url, HostPortPair* endpoint);
-
   // Turns spdy on or off.
   static void set_spdy_enabled(bool value) {
     spdy_enabled_ = value;
@@ -245,39 +247,10 @@ class NET_EXPORT HttpStreamFactory {
     return *next_protos_;
   }
 
-  // Sets the HttpStreamFactoryImpl into a mode where it can ignore certificate
-  // errors.  This is for testing.
-  static void set_ignore_certificate_errors(bool value) {
-    ignore_certificate_errors_ = value;
-  }
-  static bool ignore_certificate_errors() {
-    return ignore_certificate_errors_;
-  }
-
-  static void SetHostMappingRules(const std::string& rules);
-
-  static void set_http_pipelining_enabled(bool value) {
-    http_pipelining_enabled_ = value;
-  }
-  static bool http_pipelining_enabled() { return http_pipelining_enabled_; }
-
-  static void set_testing_fixed_http_port(int port) {
-    testing_fixed_http_port_ = port;
-  }
-  static uint16 testing_fixed_http_port() { return testing_fixed_http_port_; }
-
-  static void set_testing_fixed_https_port(int port) {
-    testing_fixed_https_port_ = port;
-  }
-  static uint16 testing_fixed_https_port() { return testing_fixed_https_port_; }
-
  protected:
   HttpStreamFactory();
 
  private:
-  static const HostMappingRules& host_mapping_rules();
-
-  static const HostMappingRules* host_mapping_rules_;
   static std::vector<std::string>* next_protos_;
   static bool enabled_protocols_[NUM_ALTERNATE_PROTOCOLS];
   static bool spdy_enabled_;
@@ -285,10 +258,6 @@ class NET_EXPORT HttpStreamFactory {
   static bool force_spdy_over_ssl_;
   static bool force_spdy_always_;
   static std::list<HostPortPair>* forced_spdy_exclusions_;
-  static bool ignore_certificate_errors_;
-  static bool http_pipelining_enabled_;
-  static uint16 testing_fixed_http_port_;
-  static uint16 testing_fixed_https_port_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpStreamFactory);
 };