Chromium Code Reviews| 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..f259f4565edf396825213754d12abe67027ae7ea 100644 |
| --- a/components/data_reduction_proxy/browser/data_reduction_proxy_params.cc |
| +++ b/components/data_reduction_proxy/browser/data_reduction_proxy_params.cc |
| @@ -330,52 +330,31 @@ std::string DataReductionProxyParams::GetDefaultDevOrigin() const { |
| } |
| std::string DataReductionProxyParams::GetDefaultOrigin() const { |
| -#if defined(SPDY_PROXY_AUTH_ORIGIN) |
| - return SPDY_PROXY_AUTH_ORIGIN; |
|
bengr
2014/07/11 20:42:53
There are lots of checks and tests for cases where
Not at Google. Contact bengr
2014/07/16 22:41:34
I think I have removed it all.
|
| -#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 |