| Index: net/proxy/proxy_server.cc
|
| diff --git a/net/proxy/proxy_server.cc b/net/proxy/proxy_server.cc
|
| index b0997e0a0fa8ec31d0fbc06f55bebdc2f27ce035..572516afcdd3c8bc4f4b8a84c60aeecacbf7ebc2 100644
|
| --- a/net/proxy/proxy_server.cc
|
| +++ b/net/proxy/proxy_server.cc
|
| @@ -220,25 +220,19 @@ ProxyServer::Scheme ProxyServer::GetSchemeFromURI(const std::string& scheme) {
|
| }
|
|
|
| // TODO(bengr): Use |scheme_| to indicate that this is the data reduction proxy.
|
| -#if defined(SPDY_PROXY_AUTH_ORIGIN)
|
| bool ProxyServer::isDataReductionProxy() const {
|
| bool dev_host = false;
|
| -#if defined (DATA_REDUCTION_DEV_HOST)
|
| dev_host = host_port_pair_.Equals(
|
| - HostPortPair::FromURL(GURL(DATA_REDUCTION_DEV_HOST)));
|
| -#endif
|
| + HostPortPair::FromURL(GURL("http://proxy-dev.googlezip.net:80/")));
|
| return dev_host || host_port_pair_.Equals(
|
| - HostPortPair::FromURL(GURL(SPDY_PROXY_AUTH_ORIGIN)));
|
| + HostPortPair::FromURL(GURL("https://proxy.googlezip.net:443/")));
|
| }
|
|
|
| bool ProxyServer::isDataReductionProxyFallback() const {
|
| -#if defined(DATA_REDUCTION_FALLBACK_HOST)
|
| return host_port_pair_.Equals(
|
| - HostPortPair::FromURL(GURL(DATA_REDUCTION_FALLBACK_HOST)));
|
| -#endif // defined(DATA_REDUCTION_FALLBACK_HOST)
|
| + HostPortPair::FromURL(GURL("http://compress.googlezip.net:80/")));
|
| return false;
|
| }
|
| -#endif // defined(SPDY_PROXY_AUTH_ORIGIN)
|
|
|
| // static
|
| ProxyServer ProxyServer::FromSchemeHostAndPort(
|
|
|