Data Reduction Proxy: Remove duplicate functions

components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc

Index: components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc
diff --git a/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc b/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc
index cd88474adfb0c9185388eacd3cd53f5c673518a4..94aec4ce75cb06b28ca49ad29d49f38e9e665910 100644
--- a/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc
+++ b/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc
@@ -19,6 +19,10 @@
 #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 {
@@ -36,8 +40,6 @@ 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";
@@ -80,22 +82,37 @@ std::string GetStringValueForVariationParamWithDefaultValue(
   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;
 
-bool IsIncludedInHoldbackFieldTrial() {
-  return IsIncludedInFieldTrial("DataCompressionProxyHoldback");
+#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 IsIncludedInAndroidOnePromoFieldTrial(
+bool IsIncludedInAndroidOnePromoFieldTrialForTesting(
     base::StringPiece build_fingerprint) {
-  return build_fingerprint.find(kAndroidOneIdentifier) != std::string::npos;
+  return IsIncludedInAndroidOnePromoFieldTrial(build_fingerprint);
+}
+
+bool IsIncludedInHoldbackFieldTrial() {
+  return IsIncludedInFieldTrial("DataCompressionProxyHoldback");
 }
 
 const char* GetTrustedSpdyProxyFieldTrialName() {
@@ -406,16 +423,13 @@ DataReductionProxyTypeInfo::DataReductionProxyTypeInfo(
 
 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);
@@ -505,19 +519,6 @@ 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 =