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 7bba0edf1c66a1f8c210ea0f7212547769bbcd58..533a6f08d7a7b1f6cfa30fbb3d14fa60fe2ac983 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_params.cc
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_params.cc
@@ -15,8 +15,18 @@
 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";

[Ryan Sleevi, 2014/07/22 01:56:31]

95% certain that these do not belong in //components.

If you're going to have Google-specific endpoints, please use //google_apis or
let the embedder supply them.

If that makes things difficult, it highlights that the API needs reconsidering
if it is to be part of //components.

[Ryan Sleevi, 2014/07/22 08:22:24]

Further red-flags: The number of HTTP URLs here for Google services.

Minimally, this requires documentation.

[bengr, 2014/07/22 18:52:51]

We put these here because ultimately we want to make the proxy available to any
app that wants to use it. We had these in platform-specific gyp before. We can
move them back there. Having the embedder pass them is possible too, but a
little clumsy, since we should require an embedder to know how to contact the
proxy.

On 2014/07/22 08:22:24, Ryan Sleevi wrote:

[Not at Google. Contact bengr, 2014/07/22 23:03:53]

Can you please clarify why the number of HTTP URLs is a red flag? This seems
like a product level decision.

[Ryan Sleevi, 2014/07/23 00:54:44]

This is more about a security-team decision, but to some extent, product has
overridden.

We actually have presubmits to make sure you're not including HTTP URLs for
Google services; Google supports HTTPS, and HTTPS supports user's privacy and
authenticity.

To the extent that there's a product level decision to override these (which,
unfortunately, there is, but which I left a remark on the bug about the
importance of documenting and potentially re-evaluating in the context of
desktop), it's important to actually clarify here in the code that there is such
a decision; that HTTP is the exception, not the norm, and the exception here is
carefully crafted.

[Not at Google. Contact bengr, 2014/08/26 17:31:08]

Discussed in https://code.google.com/p/chromium/issues/detail?id=396700.
Hardcoded values in this component seems like the way to go instead of using a
gyp.

As for http vs https URLs, this is an explicit product decision and is outside
of my control. I am not sure any comments here will be of any use to help
someone understand the code.

+
+}  // namespace anonymous
 
 namespace data_reduction_proxy {
 
@@ -323,66 +333,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 kDevHost;
   }
-#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 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