| Index: net/proxy/proxy_list.cc
|
| diff --git a/net/proxy/proxy_list.cc b/net/proxy/proxy_list.cc
|
| index 4bbb6bc6a96f2d021c66b76f333b640a405ef5d0..32cc876fd278d817afaf72dda76479ec70d59397 100644
|
| --- a/net/proxy/proxy_list.cc
|
| +++ b/net/proxy/proxy_list.cc
|
| @@ -71,13 +71,13 @@ void ProxyList::DeprioritizeBadProxies(
|
|
|
| // "proxies_ = good_proxies + bad_proxies"
|
| proxies_.swap(good_proxies);
|
| - proxies_.insert(proxies_.end(), bad_proxies_to_try.begin(),
|
| - bad_proxies_to_try.end());
|
| + proxies_.insert(
|
| + proxies_.end(), bad_proxies_to_try.begin(), bad_proxies_to_try.end());
|
| }
|
|
|
| void ProxyList::RemoveProxiesWithoutScheme(int scheme_bit_field) {
|
| for (std::vector<ProxyServer>::iterator it = proxies_.begin();
|
| - it != proxies_.end(); ) {
|
| + it != proxies_.end();) {
|
| if (!(scheme_bit_field & it->scheme())) {
|
| it = proxies_.erase(it);
|
| continue;
|
| @@ -114,8 +114,8 @@ void ProxyList::SetFromPacString(const std::string& pac_string) {
|
| base::StringTokenizer entry_tok(pac_string, ";");
|
| proxies_.clear();
|
| while (entry_tok.GetNext()) {
|
| - ProxyServer uri = ProxyServer::FromPacString(
|
| - entry_tok.token_begin(), entry_tok.token_end());
|
| + ProxyServer uri = ProxyServer::FromPacString(entry_tok.token_begin(),
|
| + entry_tok.token_end());
|
| // Silently discard malformed inputs.
|
| if (uri.is_valid())
|
| proxies_.push_back(uri);
|
| @@ -148,7 +148,6 @@ base::ListValue* ProxyList::ToValue() const {
|
|
|
| bool ProxyList::Fallback(ProxyRetryInfoMap* proxy_retry_info,
|
| const BoundNetLog& net_log) {
|
| -
|
| // TODO(eroman): It would be good if instead of removing failed proxies
|
| // from the list, we simply annotated them with the error code they failed
|
| // with. Of course, ProxyService::ReconsiderProxyAfterError() would need to
|
| @@ -167,8 +166,8 @@ bool ProxyList::Fallback(ProxyRetryInfoMap* proxy_retry_info,
|
| NOTREACHED();
|
| return false;
|
| }
|
| - UpdateRetryInfoOnFallback(proxy_retry_info, base::TimeDelta(), true,
|
| - ProxyServer(), net_log);
|
| + UpdateRetryInfoOnFallback(
|
| + proxy_retry_info, base::TimeDelta(), true, ProxyServer(), net_log);
|
|
|
| // Remove this proxy from our list.
|
| proxies_.erase(proxies_.begin());
|
| @@ -208,9 +207,8 @@ void ProxyList::UpdateRetryInfoOnFallback(
|
| if (retry_delay == base::TimeDelta()) {
|
| #if defined(SPDY_PROXY_AUTH_ORIGIN)
|
| // Randomize the timeout over a range from one to five minutes.
|
| - retry_delay =
|
| - TimeDelta::FromMilliseconds(
|
| - base::RandInt(1 * 60 * 1000, 5 * 60 * 1000));
|
| + retry_delay = TimeDelta::FromMilliseconds(
|
| + base::RandInt(1 * 60 * 1000, 5 * 60 * 1000));
|
| #else
|
| retry_delay = TimeDelta::FromMinutes(5);
|
| #endif
|
| @@ -222,14 +220,17 @@ void ProxyList::UpdateRetryInfoOnFallback(
|
| }
|
|
|
| if (!proxies_[0].is_direct()) {
|
| - AddProxyToRetryList(proxy_retry_info, retry_delay, reconsider, proxies_[0],
|
| - net_log);
|
| + AddProxyToRetryList(
|
| + proxy_retry_info, retry_delay, reconsider, proxies_[0], net_log);
|
|
|
| // If an additional proxy to bypass is specified, add it to the retry map
|
| // as well.
|
| if (another_proxy_to_bypass.is_valid()) {
|
| - AddProxyToRetryList(proxy_retry_info, retry_delay, reconsider,
|
| - another_proxy_to_bypass, net_log);
|
| + AddProxyToRetryList(proxy_retry_info,
|
| + retry_delay,
|
| + reconsider,
|
| + another_proxy_to_bypass,
|
| + net_log);
|
| }
|
| }
|
| }
|
|
|