Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(303)

Unified Diff: components/data_reduction_proxy/browser/data_reduction_proxy_params.cc

Issue 577123003: Remove primary data reduction proxy workaround added by crbug.com/388358. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/data_reduction_proxy/browser/data_reduction_proxy_params_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « no previous file | components/data_reduction_proxy/browser/data_reduction_proxy_params_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698