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 64b2ec1040c4cc533310f3826651f2c22525cdbd..790c65f08a23bca7cfda729270d568a16e577187 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_params.cc
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_params.cc
@@ -241,8 +241,9 @@ bool DataReductionProxyParams::IsDataReductionProxy(
   if (net::HostPortPair::FromURL(origin()).Equals(host_port_pair)) {
     if (proxy_servers) {
       (*proxy_servers).first = origin();
-      if (fallback_allowed())
+      if (fallback_allowed()) {

[bengr, 2014/07/17 00:11:08]

no need for these curlies.

[Not at Google. Contact bengr, 2014/07/17 18:10:21]

Done.

         (*proxy_servers).second = fallback_origin();
+      }
     }
     return true;
   }
@@ -316,66 +317,43 @@ bool DataReductionProxyParams::IsDataReductionProxyEligible(
 }
 
 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 "http://proxy-dev.googlezip.net:80/";
   }
-#endif
   return std::string();
 }
-
+// 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 "https://proxy.googlezip.net:443/";
 }
 
 std::string DataReductionProxyParams::GetDefaultFallbackOrigin() const {
-#if defined(DATA_REDUCTION_FALLBACK_HOST)
-  return DATA_REDUCTION_FALLBACK_HOST;
-#endif
-  return std::string();
+  return "http://compress.googlezip.net:80/";
 }
 
 std::string DataReductionProxyParams::GetDefaultSSLOrigin() const {
-#if defined(DATA_REDUCTION_PROXY_SSL_ORIGIN)
-  return DATA_REDUCTION_PROXY_SSL_ORIGIN;
-#endif
-  return std::string();
+  return "http://ssl.googlezip.net:1043/";
 }
 
 std::string DataReductionProxyParams::GetDefaultAltOrigin() const {
-#if defined(DATA_REDUCTION_PROXY_ALT_ORIGIN)
-  return DATA_REDUCTION_PROXY_ALT_ORIGIN;
-#endif
-  return std::string();
+  return "https://proxy.googlezip.net:443/";
 }
 
 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 "http://compress.googlezip.net:80/";
 }
 
 std::string DataReductionProxyParams::GetDefaultProbeURL() const {
-#if defined(DATA_REDUCTION_PROXY_PROBE_URL)
-  return DATA_REDUCTION_PROXY_PROBE_URL;
-#endif
-  return std::string();
+  return "http://check.googlezip.net/connect";
 }
 
 std::string DataReductionProxyParams::GetDefaultWarmupURL() const {
-#if defined(DATA_REDUCTION_PROXY_WARMUP_URL)
-  return DATA_REDUCTION_PROXY_WARMUP_URL;
-#endif
-  return std::string();
+  return "http://www.gstatic.com/generate_204";
 }
 
 }  // namespace data_reduction_proxy