diff options
| author | bolian@chromium.org <bolian@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-14 11:17:30 +0000 |
|---|---|---|
| committer | bolian@chromium.org <bolian@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-14 11:17:30 +0000 |
| commit | 324856da142fc1d8bf4e240024c311f9ab7abf10 (patch) | |
| tree | 63330fed8a0d5071731f39538fde3295a6c37074 /net | |
| parent | f0dd667e100aa8fdf28e6a2716a80aaf7af4f79e (diff) | |
| download | chromium_src-324856da142fc1d8bf4e240024c311f9ab7abf10.zip chromium_src-324856da142fc1d8bf4e240024c311f9ab7abf10.tar.gz chromium_src-324856da142fc1d8bf4e240024c311f9ab7abf10.tar.bz2 | |
Added Dev host for data reduction proxy controlled by Finch experiment.
This is only for Android. We don't need it for iOS at this point.
BUG=325345
Review URL: https://codereview.chromium.org/105833010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244669 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/proxy/proxy_server.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/proxy/proxy_server.cc b/net/proxy/proxy_server.cc index a6ea5de..deb77913 100644 --- a/net/proxy/proxy_server.cc +++ b/net/proxy/proxy_server.cc @@ -211,7 +211,12 @@ 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 { - return host_port_pair_.Equals( + bool dev_host = false; +#if defined (DATA_REDUCTION_DEV_HOST) + dev_host = host_port_pair_.Equals( + HostPortPair::FromURL(GURL(DATA_REDUCTION_DEV_HOST))); +#endif + return dev_host || host_port_pair_.Equals( HostPortPair::FromURL(GURL(SPDY_PROXY_AUTH_ORIGIN))); } |