Chromium Code Reviews| Index: net/proxy/proxy_server.cc |
| diff --git a/net/proxy/proxy_server.cc b/net/proxy/proxy_server.cc |
| index a6ea5deafdef3ad56f41e48ebc920742bd715f44..deb77913ecb5ae9b0574e1bfbb1f5c8084b439a0 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))); |
|
eroman
2013/12/19 22:35:52
what is the difference between these two defines?
bolian
2013/12/19 22:41:34
We have some bad naming due to some history reason
|
| +#endif |
| + return dev_host || host_port_pair_.Equals( |
| HostPortPair::FromURL(GURL(SPDY_PROXY_AUTH_ORIGIN))); |
| } |