Data Reduction Proxy: Remove duplicate functions

components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc

 // 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.
 
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_server.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
 #include "components/variations/variations_associated_data.h"
 #include "net/proxy/proxy_server.h"
 #include "url/url_constants.h"
 
+#if defined(OS_ANDROID)
+#include "base/android/build_info.h"
+#endif
+
 using base::FieldTrialList;
 
 namespace {
 
 const char kEnabled[] = "Enabled";
 const char kControl[] = "Control";
 const char kDisabled[] = "Disabled";
 const char kLitePage[] = "Enabled_Preview";
 const char kDefaultSpdyOrigin[] = "https://proxy.googlezip.net:443";
 // A one-off change, until the Data Reduction Proxy configuration service is
 // available.
 const char kCarrierTestOrigin[] =
     "http://o-o.preferred.nttdocomodcp-hnd1.proxy-dev.googlezip.net:80";
 const char kDefaultFallbackOrigin[] = "compress.googlezip.net:80";
 const char kDefaultSecureProxyCheckUrl[] = "http://check.googlezip.net/connect";
 const char kDefaultWarmupUrl[] = "http://check.googlezip.net/generate_204";
 
-const char kAndroidOneIdentifier[] = "sprout";
-
 const char kQuicFieldTrial[] = "DataReductionProxyUseQuic";
 
 const char kLoFiFieldTrial[] = "DataCompressionProxyLoFi";
 const char kLoFiFlagFieldTrial[] = "DataCompressionProxyLoFiFlag";
 
 const char kBlackListTransitionFieldTrial[] =
     "DataReductionProxyPreviewsBlackListTransition";
 
 const char kTrustedSpdyProxyFieldTrialName[] = "DataReductionTrustedSpdyProxy";
 
@@ skipping 22 matching lines @@
 std::string GetStringValueForVariationParamWithDefaultValue(
     const std::map<std::string, std::string>& variation_params,
     const std::string& parameter_name,
     const std::string& default_value) {
   const auto it = variation_params.find(parameter_name);
   if (it == variation_params.end())
     return default_value;
   return it->second;
 }
 
+bool IsIncludedInAndroidOnePromoFieldTrial(
+    base::StringPiece build_fingerprint) {
+  static const char kAndroidOneIdentifier[] = "sprout";
+  return build_fingerprint.find(kAndroidOneIdentifier) != std::string::npos;
+}
+
 }  // namespace
 
 namespace data_reduction_proxy {
 namespace params {
 
 bool IsIncludedInPromoFieldTrial() {
-  return IsIncludedInFieldTrial("DataCompressionProxyPromoVisibility");
+  if (IsIncludedInFieldTrial("DataCompressionProxyPromoVisibility"))
+    return true;
+
+#if defined(OS_ANDROID)
+  base::StringPiece android_build_fingerprint =
+      base::android::BuildInfo::GetInstance()->android_build_fp();
+
+  return IsIncludedInAndroidOnePromoFieldTrial(android_build_fingerprint);
+#endif
+  return false;
+}
+
+bool IsIncludedInAndroidOnePromoFieldTrialForTesting(
+    base::StringPiece build_fingerprint) {
+  return IsIncludedInAndroidOnePromoFieldTrial(build_fingerprint);
 }
 
 bool IsIncludedInHoldbackFieldTrial() {
   return IsIncludedInFieldTrial("DataCompressionProxyHoldback");
 }
 
-bool IsIncludedInAndroidOnePromoFieldTrial(
-    base::StringPiece build_fingerprint) {
-  return build_fingerprint.find(kAndroidOneIdentifier) != std::string::npos;
-}
-
 const char* GetTrustedSpdyProxyFieldTrialName() {
   return kTrustedSpdyProxyFieldTrialName;
 }
 
 bool IsIncludedInTrustedSpdyProxyFieldTrial() {
   return IsIncludedInFieldTrial(GetTrustedSpdyProxyFieldTrialName());
 }
 
 const char* GetLoFiFieldTrialName() {
   return kLoFiFieldTrial;
@@ skipping 288 matching lines @@
 
 }  // namespace params
 
 DataReductionProxyTypeInfo::DataReductionProxyTypeInfo() : proxy_index(0) {}
 
 DataReductionProxyTypeInfo::DataReductionProxyTypeInfo(
     const DataReductionProxyTypeInfo& other) = default;
 
 DataReductionProxyTypeInfo::~DataReductionProxyTypeInfo() {}
 
-DataReductionProxyParams::DataReductionProxyParams(int flags)
-    : DataReductionProxyParams(flags, true) {}
+DataReductionProxyParams::DataReductionProxyParams()
+    : DataReductionProxyParams(true) {}
 
 DataReductionProxyParams::~DataReductionProxyParams() {}
 
-DataReductionProxyParams::DataReductionProxyParams(int flags,
-                                                   bool should_call_init)
-    : promo_allowed_((flags & kPromoAllowed) == kPromoAllowed),
-      holdback_((flags & kHoldback) == kHoldback),
-      use_override_proxies_for_http_(false) {
+DataReductionProxyParams::DataReductionProxyParams(bool should_call_init)
+    : use_override_proxies_for_http_(false) {
   if (should_call_init) {
     bool result = Init();
     DCHECK(result);
   }
 }
 
 void DataReductionProxyParams::SetProxiesForHttpForTesting(
     const std::vector<DataReductionProxyServer>& proxies_for_http) {
   proxies_for_http_ = proxies_for_http;
 }
@@ skipping 69 matching lines @@
     return override_data_reduction_proxy_servers_;
   return proxies_for_http_;
 }
 
 // Returns the URL to check to decide if the secure proxy origin should be
 // used.
 const GURL& DataReductionProxyParams::secure_proxy_check_url() const {
   return secure_proxy_check_url_;
 }
 
-// Returns true if the data reduction proxy promo may be shown.
-// This is idependent of whether the data reduction proxy is allowed.
-// TODO(bengr): maybe tie to whether proxy is allowed.
-bool DataReductionProxyParams::promo_allowed() const {
-  return promo_allowed_;
-}
-
-// Returns true if the data reduction proxy should not actually use the
-// proxy if enabled.
-bool DataReductionProxyParams::holdback() const {
-  return holdback_;
-}
-
 // TODO(kundaji): Remove tests for macro definitions.
 std::string DataReductionProxyParams::GetDefaultOrigin() const {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kEnableDataReductionProxyCarrierTest))
     return kCarrierTestOrigin;
   return kDefaultSpdyOrigin;
 }
 
 std::string DataReductionProxyParams::GetDefaultFallbackOrigin() const {
   return kDefaultFallbackOrigin;
 }
 
 std::string DataReductionProxyParams::GetDefaultSecureProxyCheckURL() const {
   return kDefaultSecureProxyCheckUrl;
 }
 
 
 }  // namespace data_reduction_proxy