| 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";
|
| +
|
| +} // 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
|
|
|