Remove static variables from HttpStreamFactory.

net/http/http_stream_factory.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_STREAM_FACTORY_H_
 #define NET_HTTP_HTTP_STREAM_FACTORY_H_
 
 #include <list>
 #include <string>
 #include <vector>
@@ skipping 145 matching lines @@
 // The HttpStreamFactory defines an interface for creating usable HttpStreams.
 class NET_EXPORT HttpStreamFactory {
  public:
   virtual ~HttpStreamFactory();
 
   void ProcessAlternateProtocol(
       HttpServerProperties* http_server_properties,
       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.
   // Will callback to the HttpStreamRequestDelegate upon completion.
   virtual HttpStreamRequest* RequestStream(
       const HttpRequestInfo& info,
       const SSLConfig& server_ssl_config,
       const SSLConfig& proxy_ssl_config,
       HttpStreamRequest::Delegate* delegate,
       const BoundNetLog& net_log) = 0;
 
   // Requests that enough connections for |num_streams| be opened.
   virtual void PreconnectStreams(int num_streams,
                                  const HttpRequestInfo& info,
                                  const SSLConfig& server_ssl_config,
                                  const SSLConfig& proxy_ssl_config) = 0;
 
   // If pipelining is supported, creates a Value summary of the currently active
   // pipelines. Caller assumes ownership of the returned value. Otherwise,
   // 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;
     if (!spdy_enabled_) {
       delete next_protos_;
       next_protos_ = NULL;
     }
   }
   static bool spdy_enabled() { return spdy_enabled_; }
 
@@ skipping 33 matching lines @@
   static void EnableNpnSpdy3();
 
   // Sets the protocols supported by NPN (next protocol negotiation) during the
   // SSL handshake as well as by HTTP Alternate-Protocol.
   static void SetNextProtos(const std::vector<std::string>& value);
   static bool has_next_protos() { return next_protos_ != NULL; }
   static const std::vector<std::string>& next_protos() {
     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_;
   static bool use_alternate_protocols_;
   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);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_STREAM_FACTORY_H_