Remove the Data Reduction Proxy TLS experiment code

components/data_reduction_proxy/core/common/data_reduction_proxy_params.h

Index: components/data_reduction_proxy/core/common/data_reduction_proxy_params.h
diff --git a/components/data_reduction_proxy/core/common/data_reduction_proxy_params.h b/components/data_reduction_proxy/core/common/data_reduction_proxy_params.h
index 8080df10915c275dafa7112d4b04a45630f4e765..b757aae25b4c1e9a45188e96d016ac3f877607ce 100644
--- a/components/data_reduction_proxy/core/common/data_reduction_proxy_params.h
+++ b/components/data_reduction_proxy/core/common/data_reduction_proxy_params.h
@@ -145,15 +145,13 @@ std::string GetServerExperimentsFieldTrialName();
 
 // Contains information about a given proxy server. |proxies_for_http| and
 // |proxies_for_https| contain the configured data reduction proxy servers.

[tbansal1, 2016/04/12 05:16:31]

Remove/Reword this comment because it contains |proxies_for_https|

[megjablon, 2016/04/12 21:02:37]

Done.

-// |is_fallback| and |is_ssl| note whether the given proxy is a fallback or a
-// proxy for ssl; these are not mutually exclusive.
+// |is_fallback| notes whether the given proxy is a fallback.
 struct DataReductionProxyTypeInfo {
   DataReductionProxyTypeInfo();
   DataReductionProxyTypeInfo(const DataReductionProxyTypeInfo& other);
   ~DataReductionProxyTypeInfo();
   std::vector<net::ProxyServer> proxy_servers;
   bool is_fallback;
-  bool is_ssl;
 };
 
 // Provides initialization parameters. Proxy origins, and the secure proxy
@@ -169,14 +167,10 @@ class DataReductionProxyParams : public DataReductionProxyConfigValues {
   // holdback experiment.
   static const unsigned int kAllowed = (1 << 0);
   static const unsigned int kFallbackAllowed = (1 << 1);
-  // DEPRECATED. TODO(jeremyim): Remove once changes merged downstream.
-  static const unsigned int kAlternativeAllowed = (1 << 2);
-  // DEPRECATED. TODO(jeremyim): Remove once changes merged downstream.
-  static const unsigned int kAlternativeFallbackAllowed = (1 << 3);
   static const unsigned int kAllowAllProxyConfigurations =
       kAllowed | kFallbackAllowed;
-  static const unsigned int kPromoAllowed = (1 << 4);
-  static const unsigned int kHoldback = (1 << 5);
+  static const unsigned int kPromoAllowed = (1 << 2);
+  static const unsigned int kHoldback = (1 << 3);
 
   // Constructs configuration parameters. If |kAllowed|, then the standard
   // data reduction proxy configuration is allowed to be used. If
@@ -193,13 +187,8 @@ class DataReductionProxyParams : public DataReductionProxyConfigValues {
   // If true, uses QUIC instead of SPDY to connect to proxies that use TLS.
   void EnableQuic(bool enable);
 
-  // Overrides of |DataReductionProxyConfigValues|
-  bool UsingHTTPTunnel(const net::HostPortPair& proxy_server) const override;
-
   const std::vector<net::ProxyServer>& proxies_for_http() const override;
 
-  const std::vector<net::ProxyServer>& proxies_for_https() const override;
-
   const GURL& secure_proxy_check_url() const override;
 
   bool allowed() const override;
@@ -230,17 +219,14 @@ class DataReductionProxyParams : public DataReductionProxyConfigValues {
   // and an empty string otherwise.
   virtual std::string GetDefaultOrigin() const;
   virtual std::string GetDefaultFallbackOrigin() const;
-  virtual std::string GetDefaultSSLOrigin() const;
   virtual std::string GetDefaultSecureProxyCheckURL() const;
   virtual std::string GetDefaultWarmupURL() const;
 
   std::vector<net::ProxyServer> proxies_for_http_;
-  std::vector<net::ProxyServer> proxies_for_https_;
 
  private:
   net::ProxyServer origin_;
   net::ProxyServer fallback_origin_;
-  net::ProxyServer ssl_origin_;
 
   GURL secure_proxy_check_url_;
   GURL warmup_url_;