Data Reduction Proxy: Remove duplicate functions

components/data_reduction_proxy/core/common/data_reduction_proxy_params.h

 // Copyright 2014 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 COMPONENTS_DATA_REDUCTION_PROXY_CORE_COMMON_DATA_REDUCTION_PROXY_PARAMS_H_
 #define COMPONENTS_DATA_REDUCTION_PROXY_CORE_COMMON_DATA_REDUCTION_PROXY_PARAMS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 28 matching lines @@
 bool IsIncludedInHoldbackFieldTrial();
 
 // Returns the name of the trusted SPDY/HTTP2 proxy field trial.
 const char* GetTrustedSpdyProxyFieldTrialName();
 
 // Returns true if this client is part of the enabled group of the trusted
 // SPDY/HTTP2 proxy field trial.
 bool IsIncludedInTrustedSpdyProxyFieldTrial();
 
 // Returns true if this client is part of the field trial that should display
-// a promotion for the data reduction proxy on Android One devices.
-bool IsIncludedInAndroidOnePromoFieldTrial(base::StringPiece build_fingerprint);
+// a promotion for the data reduction proxy on Android One devices. This is for
+// testing purposes and should not be called outside of tests.
+bool IsIncludedInAndroidOnePromoFieldTrialForTesting(
+    base::StringPiece build_fingerprint);
 
 // Returns the name of the Lo-Fi field trial.
 const char* GetLoFiFieldTrialName();
 
 // Returns the name of the Lo-Fi field trial that configures LoFi flags when it
 // is force enabled through flags.
 const char* GetLoFiFlagFieldTrialName();
 
 // Returns true if this client is part of the "Enabled" or "Enabled_Preview"
 // group of the Lo-Fi field trial, both of which mean Lo-Fi should be enabled.
@@ skipping 118 matching lines @@
   size_t proxy_index;
 };
 
 // Provides initialization parameters. Proxy origins, and the secure proxy
 // check url are are taken from flags if available and from preprocessor
 // constants otherwise. The DataReductionProxySettings class and others use this
 // class to determine the necessary DNS names to configure use of the Data
 // Reduction Proxy.
 class DataReductionProxyParams : public DataReductionProxyConfigValues {
  public:
-  // Flags used during construction that specify if the promotion is allowed to
-  // be shown, and if this instance is part of a holdback experiment.
-  static const unsigned int kPromoAllowed = (1 << 2);
-  static const unsigned int kHoldback = (1 << 3);
-
-  // Constructs configuration parameters. If |kPromoAllowed|, the client may
-  // show a promotion for the data reduction proxy.
-  //
-  // A standard configuration has a primary proxy, and a fallback proxy for
-  // HTTP traffic.
-  explicit DataReductionProxyParams(int flags);
+  // Constructs configuration parameters. A standard configuration has a primary
+  // proxy, and a fallback proxy for HTTP traffic.
+  DataReductionProxyParams();
 
   // Updates |proxies_for_http_|.
   void SetProxiesForHttpForTesting(
       const std::vector<DataReductionProxyServer>& proxies_for_http);
 
   ~DataReductionProxyParams() override;
 
   const std::vector<DataReductionProxyServer>& proxies_for_http()
       const override;
 
   const GURL& secure_proxy_check_url() const override;
 
-  bool promo_allowed() const override;
-
-  bool holdback() const override;
-
  protected:
   // Test constructor that optionally won't call Init();
-  DataReductionProxyParams(int flags,
-                           bool should_call_init);
+  explicit DataReductionProxyParams(bool should_call_init);
 
   // Initialize the values of the proxies, and secure proxy check URL, from
   // command line flags and preprocessor constants, and check that there are
   // corresponding definitions for the allowed configurations.
   bool Init();
 
   // Initialize the values of the proxies, and secure proxy check URL from
   // command line flags and preprocessor constants.
   void InitWithoutChecks();
 
   // Returns the corresponding string from preprocessor constants if defined,
   // and an empty string otherwise.
   virtual std::string GetDefaultOrigin() const;
   virtual std::string GetDefaultFallbackOrigin() const;
   virtual std::string GetDefaultSecureProxyCheckURL() const;
 
  private:
   std::vector<DataReductionProxyServer> proxies_for_http_;
 
   net::ProxyServer origin_;
   net::ProxyServer fallback_origin_;
 
   GURL secure_proxy_check_url_;
 
-  bool promo_allowed_;
-  bool holdback_;
-
   bool use_override_proxies_for_http_;
   std::vector<DataReductionProxyServer> override_data_reduction_proxy_servers_;
 
   DISALLOW_COPY_AND_ASSIGN(DataReductionProxyParams);
 };
 
 }  // namespace data_reduction_proxy
 
 #endif  // COMPONENTS_DATA_REDUCTION_PROXY_CORE_COMMON_DATA_REDUCTION_PROXY_PARAMS_H_