Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(165)

Unified Diff: components/data_reduction_proxy/browser/data_reduction_proxy_params.cc

Issue 382313003: Add data reduction functionality to all platforms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Patch to run tests overnight. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..a336c0ed4112c745e087e5852100035d76378324 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_params.cc
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_params.cc
@@ -316,66 +316,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/";
bengr 2014/07/15 16:38:17 Add a TODO that this class and its tests should be
Not at Google. Contact bengr 2014/07/16 22:41:34 Added todo and an entry in sheet.
}
-#endif
return std::string();
}
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

Powered by Google App Engine
This is Rietveld 408576698