Chromium Code Reviews| Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol.cc |
| diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol.cc |
| index b2260502ed8fb5cbe3004fe2764c9c3267b98850..4ccc375af6505a0976a3f09291ee82a87f1158ba 100644 |
| --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol.cc |
| +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol.cc |
| @@ -39,6 +39,7 @@ void MarkProxiesAsBadUntil( |
| // Synthesize a suitable |ProxyInfo| to add the proxies to the |
| // |ProxyRetryInfoMap| of the proxy service. |
| net::ProxyList proxy_list; |
| + std::vector<net::ProxyServer> additional_bad_proxies; |
|
bengr
2015/05/12 15:36:46
#include <vector>
jeremyim
2015/05/12 18:53:14
Done.
|
| net::ProxyServer primary = data_reduction_proxies.first; |
| if (primary.is_valid()) |
| proxy_list.AddProxyServer(primary); |
| @@ -47,8 +48,10 @@ void MarkProxiesAsBadUntil( |
| if (data_reduction_proxies.second.is_valid() && |
| !data_reduction_proxies.second.host_port_pair().IsEmpty()) |
| fallback = data_reduction_proxies.second; |
| - if (fallback.is_valid()) |
| + if (fallback.is_valid()) { |
| proxy_list.AddProxyServer(fallback); |
| + additional_bad_proxies.push_back(fallback); |
| + } |
| proxy_list.AddProxyServer(net::ProxyServer::Direct()); |
| } |
| net::ProxyInfo proxy_info; |
| @@ -57,10 +60,8 @@ void MarkProxiesAsBadUntil( |
| net::ProxyService* proxy_service = request->context()->proxy_service(); |
| DCHECK(proxy_service); |
| - proxy_service->MarkProxiesAsBadUntil(proxy_info, |
| - bypass_duration, |
| - fallback, |
| - request->net_log()); |
| + proxy_service->MarkProxiesAsBadUntil( |
| + proxy_info, bypass_duration, additional_bad_proxies, request->net_log()); |
| } |
| } // namespace |