Update marking proxies as bad in ProxyList/ProxyService to use a std::vector

net/proxy/proxy_list.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/proxy/proxy_list.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/time/time.h"
@@ skipping 154 matching lines @@
   // And also, before failing the transaction wholesale, we could go back and
   // retry the "bad proxies" which we never tried to begin with.
   // (RemoveBadProxies would annotate them as 'expected bad' rather then delete
   // them from the list, so we would know what they were).
 
   if (proxies_.empty()) {
     NOTREACHED();
     return false;
   }
   // By default, proxies are not retried for 5 minutes.
-  UpdateRetryInfoOnFallback(proxy_retry_info,
-                            TimeDelta::FromMinutes(5),
-                            true,
-                            ProxyServer(),
-                            net_error,
-                            net_log);
+  UpdateRetryInfoOnFallback(proxy_retry_info, TimeDelta::FromMinutes(5), true,
+                            std::vector<ProxyServer>(), net_error, net_log);
 
   // Remove this proxy from our list.
   proxies_.erase(proxies_.begin());
   return !proxies_.empty();
 }
 
 void ProxyList::AddProxyToRetryList(ProxyRetryInfoMap* proxy_retry_info,
                                     base::TimeDelta retry_delay,
                                     bool try_while_bad,
                                     const ProxyServer& proxy_to_retry,
@@ skipping 15 matching lines @@
     (*proxy_retry_info)[proxy_key] = retry_info;
   }
   net_log.AddEvent(NetLog::TYPE_PROXY_LIST_FALLBACK,
                    NetLog::StringCallback("bad_proxy", &proxy_key));
 }
 
 void ProxyList::UpdateRetryInfoOnFallback(
     ProxyRetryInfoMap* proxy_retry_info,
     base::TimeDelta retry_delay,
     bool reconsider,
-    const ProxyServer& another_proxy_to_bypass,
+    const std::vector<ProxyServer>& additional_proxies_to_bypass,
     int net_error,
     const BoundNetLog& net_log) const {
   DCHECK(retry_delay != base::TimeDelta());
 
   if (proxies_.empty()) {
     NOTREACHED();
     return;
   }
 
   if (!proxies_[0].is_direct()) {
     AddProxyToRetryList(proxy_retry_info,
                         retry_delay,
                         reconsider,
                         proxies_[0],
                         net_error,
                         net_log);
-
-    // If an additional proxy to bypass is specified, add it to the retry map
+    // If any additional proxies to bypass are specified, add 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_error,
-                          net_log);
+    for (const ProxyServer& additional_proxy : additional_proxies_to_bypass) {
+      AddProxyToRetryList(proxy_retry_info, retry_delay, reconsider,
+                          additional_proxy, net_error, net_log);
     }
   }
 }
 
 }  // namespace net