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

Unified Diff: net/proxy/proxy_service.h

Issue 1128823005: Update marking proxies as bad in ProxyList/ProxyService to use a std::vector (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit test failure Created 5 years, 7 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 | « net/proxy/proxy_list_unittest.cc ('k') | net/proxy/proxy_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_service.h
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h
index 232a944a173c3362ec413359774436f21a584eea..1505162b045aba0e735f38d092f0fdcc6ce518da 100644
--- a/net/proxy/proxy_service.h
+++ b/net/proxy/proxy_service.h
@@ -164,18 +164,19 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
// Explicitly trigger proxy fallback for the given |results| by updating our
// list of bad proxies to include the first entry of |results|, and,
- // optionally, another bad proxy. Will retry after |retry_delay| if positive,
- // and will use the default proxy retry duration otherwise. Proxies marked as
- // bad will not be retried until |retry_delay| has passed. Returns true if
- // there will be at least one proxy remaining in the list after fallback and
- // false otherwise. This method should be used to add proxies to the bad
- // proxy list only for reasons other than a network error. If a proxy needs
- // to be added to the bad proxy list because a network error was encountered
- // when trying to connect to it, use |ReconsiderProxyAfterError|.
- bool MarkProxiesAsBadUntil(const ProxyInfo& results,
- base::TimeDelta retry_delay,
- const ProxyServer& another_bad_proxy,
- const BoundNetLog& net_log);
+ // additional bad proxies (can be none). Will retry after |retry_delay| if
+ // positive, and will use the default proxy retry duration otherwise. Proxies
+ // marked as bad will not be retried until |retry_delay| has passed. Returns
+ // true if there will be at least one proxy remaining in the list after
+ // fallback and false otherwise. This method should be used to add proxies to
+ // the bad proxy list only for reasons other than a network error. If a proxy
+ // needs to be added to the bad proxy list because a network error was
+ // encountered when trying to connect to it, use |ReconsiderProxyAfterError|.
+ bool MarkProxiesAsBadUntil(
+ const ProxyInfo& results,
+ base::TimeDelta retry_delay,
+ const std::vector<ProxyServer>& additional_bad_proxies,
+ const BoundNetLog& net_log);
// Called to report that the last proxy connection succeeded. If |proxy_info|
// has a non empty proxy_retry_info map, the proxies that have been tried (and
« no previous file with comments | « net/proxy/proxy_list_unittest.cc ('k') | net/proxy/proxy_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698