| 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..c96b05be37da644ba93ecaf8b544233ca5f74295 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/";
|
| }
|
| -#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
|
|
|