Add data reduction functionality to all platforms.

components/data_reduction_proxy/browser/data_reduction_proxy_params.cc

Index: components/data_reduction_proxy/browser/data_reduction_proxy_params.cc
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_params.cc b/components/data_reduction_proxy/browser/data_reduction_proxy_params.cc
index 3088e083eabe41bbfde98532a6d12f9ec78fc1fd..c3a06663ffe316187aa4b42561a912be23b97f78 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_params.cc
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_params.cc
@@ -24,16 +24,20 @@
 using base::FieldTrialList;
 
 namespace {
+
 const char kEnabled[] = "Enabled";
-}
+const char kDefaultOrigin[] = "https://proxy.googlezip.net:443/";
+const char kDevHost[] = "http://proxy-dev.googlezip.net:80/";
+const char kDefaultFallbackOrigin[] = "http://compress.googlezip.net:80/";
+const char kDefaultSslOrigin[] = "http://ssl.googlezip.net:1043/";
+const char kDefaultAltOrigin[] = "https://proxy.googlezip.net:443/";
+const char kDefaultAltFallbackOrigin[] = "http://compress.googlezip.net:80/";
+const char kDefaultProbeUrl[] = "http://check.googlezip.net/connect";
+const char kDefaultWarmupUrl[] = "http://www.gstatic.com/generate_204";
 
-namespace data_reduction_proxy {
+}  // namespace anonymous

[mmenke, 2014/09/08 18:11:14]

nit:  --anonymous

[Not at Google. Contact bengr, 2014/09/08 19:18:35]

Done.

 
-// static
-bool DataReductionProxyParams::IsIncludedInFieldTrial() {
-  return base::FieldTrialList::FindFullName(
-      "DataCompressionProxyRollout") == kEnabled;
-}
+namespace data_reduction_proxy {
 
 // static
 bool DataReductionProxyParams::IsIncludedInAlternativeFieldTrial() {
@@ -49,15 +53,13 @@ bool DataReductionProxyParams::IsIncludedInPromoFieldTrial() {
 
 // static
 bool DataReductionProxyParams::IsIncludedInPreconnectHintingFieldTrial() {
-  return IsIncludedInFieldTrial() &&
-      FieldTrialList::FindFullName(
+  return FieldTrialList::FindFullName(
           "DataCompressionProxyPreconnectHints") == kEnabled;
 }
 
 // static
 bool DataReductionProxyParams::IsIncludedInCriticalPathBypassFieldTrial() {
-  return IsIncludedInFieldTrial() &&
-      FieldTrialList::FindFullName(
+  return FieldTrialList::FindFullName(
           "DataCompressionProxyCriticalBypass") == kEnabled;
 }
 
@@ -383,16 +385,14 @@ bool DataReductionProxyParams::IsBypassedByDataReductionProxyLocalRules(
 }
 
 std::string DataReductionProxyParams::GetDefaultDevOrigin() const {
-#if defined(DATA_REDUCTION_DEV_HOST)
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kDisableDataReductionProxyDev))
     return std::string();
   if (command_line.HasSwitch(switches::kEnableDataReductionProxyDev) ||
       (FieldTrialList::FindFullName("DataCompressionProxyDevRollout") ==
          kEnabled)) {
-    return DATA_REDUCTION_DEV_HOST;
+    return kDevHost;
   }
-#endif
   return std::string();
 }
 
@@ -481,53 +481,33 @@ bool DataReductionProxyParams::ArePrimaryAndFallbackBypassed(
   return found != retry_map.end();
 }
 
+// TODO(kundaji): Remove tests for macro definitions.
 std::string DataReductionProxyParams::GetDefaultOrigin() const {
-#if defined(SPDY_PROXY_AUTH_ORIGIN)
-  return SPDY_PROXY_AUTH_ORIGIN;
-#endif
-  return std::string();
+  return kDefaultOrigin;
 }
 
 std::string DataReductionProxyParams::GetDefaultFallbackOrigin() const {
-#if defined(DATA_REDUCTION_FALLBACK_HOST)
-  return DATA_REDUCTION_FALLBACK_HOST;
-#endif
-  return std::string();
+  return kDefaultFallbackOrigin;
 }
 
 std::string DataReductionProxyParams::GetDefaultSSLOrigin() const {
-#if defined(DATA_REDUCTION_PROXY_SSL_ORIGIN)
-  return DATA_REDUCTION_PROXY_SSL_ORIGIN;
-#endif
-  return std::string();
+  return kDefaultSslOrigin;
 }
 
 std::string DataReductionProxyParams::GetDefaultAltOrigin() const {
-#if defined(DATA_REDUCTION_PROXY_ALT_ORIGIN)
-  return DATA_REDUCTION_PROXY_ALT_ORIGIN;
-#endif
-  return std::string();
+  return kDefaultAltOrigin;
 }
 
 std::string DataReductionProxyParams::GetDefaultAltFallbackOrigin() const {
-#if defined(DATA_REDUCTION_PROXY_ALT_FALLBACK_ORIGIN)
-  return DATA_REDUCTION_PROXY_ALT_FALLBACK_ORIGIN;
-#endif
-  return std::string();
+  return kDefaultAltFallbackOrigin;
 }
 
 std::string DataReductionProxyParams::GetDefaultProbeURL() const {
-#if defined(DATA_REDUCTION_PROXY_PROBE_URL)
-  return DATA_REDUCTION_PROXY_PROBE_URL;
-#endif
-  return std::string();
+  return kDefaultProbeUrl;
 }
 
 std::string DataReductionProxyParams::GetDefaultWarmupURL() const {
-#if defined(DATA_REDUCTION_PROXY_WARMUP_URL)
-  return DATA_REDUCTION_PROXY_WARMUP_URL;
-#endif
-  return std::string();
+  return kDefaultWarmupUrl;
 }
 
 }  // namespace data_reduction_proxy