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..8df92dc608e9b17299f3b4366e38f5ad43c24f7f 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";

[mmenke, 2014/09/10 15:16:48]

Should these URLs be in /components/google/core/browser/google_util?

We can either make sure they're empty for unofficial builds, or even keep them
in the internal repo (No so much for secrecy, but to make absolutely sure
they're only used by our official builds).

The latter option also at least makes it theoretically easier for third parties
to plug in their own, though this code isn't exactly intended to be general
purpose.

[Not at Google. Contact bengr, 2014/09/10 21:38:34]

Not sure why you mention putting URLs in
/components/google/core/browser/google_util? The data reduction component seems
more self contained if the URLs are here.

Keeping the URLs in internal repo means that we need to have gyp conditionals
which does not seem ideal.

Note that the SPDY_PROXY_AUTH_VALUE will continue to live in gypi files and is
internal only. Data reduction proxy cannot be used without this value. I have a
bug assigned to me to ensure that data reduction functionality does not get
initialized when the auth value is missing.

Being able to reuse DRP component code with other similar non-google provided
service is not a current design goal.

[mmenke, 2014/09/10 21:46:33]

google_util is nominally where the google-specific URLs all hang out, though
there are certainly a huge number of violations of that.  It also ensures that
on Chromium/third-party builds, none of these URLs are even defined, so no
matter how badly third parties mangle the code, they won't accidentally end up
spamming requests to these URLs.  Anyhow, not something I'm going to insist on.

 
-namespace data_reduction_proxy {
+}  // namespace
 
-// 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