| 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 43d0795a573ce019e49491ef52d8bcc3a916862d..4a44b22c1f693ce8b98122cd61d56f4517cc1ba7 100644
|
| --- a/components/data_reduction_proxy/browser/data_reduction_proxy_params.cc
|
| +++ b/components/data_reduction_proxy/browser/data_reduction_proxy_params.cc
|
| @@ -117,10 +117,6 @@ DataReductionProxyParams::GetAllowedProxies() const {
|
| DataReductionProxyList list;
|
| if (allowed_) {
|
| list.push_back(origin_);
|
| - // TODO(bolian): revert this once the proxy PAC fix is ready.
|
| - if (GURL(GetDefaultDevOrigin()) == origin()) {
|
| - list.push_back(GURL(GetDefaultOrigin()));
|
| - }
|
| }
|
| if (allowed_ && fallback_allowed_)
|
| list.push_back(fallback_origin_);
|
| @@ -296,22 +292,6 @@ bool DataReductionProxyParams::IsDataReductionProxy(
|
| return true;
|
| }
|
|
|
| - // TODO(bolian): revert this once the proxy PAC fix is ready.
|
| - //
|
| - // If dev host is configured as the primary proxy, we treat the default
|
| - // origin as a valid data reduction proxy to workaround PAC script.
|
| - if (GURL(GetDefaultDevOrigin()) == origin()) {
|
| - const GURL& default_origin = GURL(GetDefaultOrigin());
|
| - if (net::HostPortPair::FromURL(default_origin).Equals(host_port_pair)) {
|
| - if (proxy_info) {
|
| - proxy_info->proxy_servers.first = default_origin;
|
| - if (fallback_allowed())
|
| - proxy_info->proxy_servers.second = fallback_origin();
|
| - }
|
| - return true;
|
| - }
|
| - }
|
| -
|
| if (fallback_allowed() &&
|
| net::HostPortPair::FromURL(fallback_origin()).Equals(host_port_pair)) {
|
| if (proxy_info) {
|
|
|