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

net/proxy/proxy_list_unittest.cc

 // Copyright (c) 2006-2008 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 "net/base/net_errors.h"
 #include "net/log/net_log.h"
 #include "net/proxy/proxy_retry_info.h"
 #include "net/proxy/proxy_server.h"
@@ skipping 157 matching lines @@
 
 TEST(ProxyListTest, UpdateRetryInfoOnFallback) {
   ProxyRetryInfo proxy_retry_info;
   // Retrying should put the first proxy on the retry list.
   {
     ProxyList list;
     ProxyRetryInfoMap retry_info_map;
     BoundNetLog net_log;
     ProxyServer proxy_server(
         ProxyServer::FromURI("foopy1:80", ProxyServer::SCHEME_HTTP));
+    std::vector<ProxyServer> bad_proxies;

[bengr, 2015/05/12 15:36:46]

#include <vector>

[jeremyim, 2015/05/12 18:53:14]

Done.

+    bad_proxies.push_back(proxy_server);
     list.SetFromPacString("PROXY foopy1:80;PROXY foopy2:80;PROXY foopy3:80");
-    list.UpdateRetryInfoOnFallback(&retry_info_map,
-                                   base::TimeDelta::FromSeconds(60),
-                                   true,
-                                   proxy_server,
-                                   ERR_PROXY_CONNECTION_FAILED,
-                                   net_log);
+    list.UpdateRetryInfoOnFallback(
+        &retry_info_map, base::TimeDelta::FromSeconds(60), true, bad_proxies,
+        ERR_PROXY_CONNECTION_FAILED, net_log);
     EXPECT_TRUE(retry_info_map.end() != retry_info_map.find("foopy1:80"));
     EXPECT_EQ(ERR_PROXY_CONNECTION_FAILED,
               retry_info_map[proxy_server.ToURI()].net_error);
     EXPECT_TRUE(retry_info_map.end() == retry_info_map.find("foopy2:80"));
     EXPECT_TRUE(retry_info_map.end() == retry_info_map.find("foopy3:80"));
   }
   // Retrying should put the first proxy on the retry list, even if there
   // was no network error.
   {
     ProxyList list;
     ProxyRetryInfoMap retry_info_map;
     BoundNetLog net_log;
     ProxyServer proxy_server(
         ProxyServer::FromURI("foopy1:80", ProxyServer::SCHEME_HTTP));
+    std::vector<ProxyServer> bad_proxies;
+    bad_proxies.push_back(proxy_server);
     list.SetFromPacString("PROXY foopy1:80;PROXY foopy2:80;PROXY foopy3:80");
     list.UpdateRetryInfoOnFallback(&retry_info_map,
-                                   base::TimeDelta::FromSeconds(60),
-                                   true,
-                                   proxy_server,
-                                   OK,
-                                   net_log);
+                                   base::TimeDelta::FromSeconds(60), true,
+                                   bad_proxies, OK, net_log);
     EXPECT_TRUE(retry_info_map.end() != retry_info_map.find("foopy1:80"));
     EXPECT_EQ(OK, retry_info_map[proxy_server.ToURI()].net_error);
     EXPECT_TRUE(retry_info_map.end() == retry_info_map.find("foopy2:80"));
     EXPECT_TRUE(retry_info_map.end() == retry_info_map.find("foopy3:80"));
   }
   // Including another bad proxy should put both the first and the specified
   // proxy on the retry list.
   {
     ProxyList list;
     ProxyRetryInfoMap retry_info_map;
     BoundNetLog net_log;
     ProxyServer proxy_server = ProxyServer::FromURI("foopy3:80",
                                                     ProxyServer::SCHEME_HTTP);
+    std::vector<ProxyServer> bad_proxies;
+    bad_proxies.push_back(proxy_server);
     list.SetFromPacString("PROXY foopy1:80;PROXY foopy2:80;PROXY foopy3:80");
-    list.UpdateRetryInfoOnFallback(&retry_info_map,
-                                   base::TimeDelta::FromSeconds(60),
-                                   true,
-                                   proxy_server,
-                                   ERR_NAME_RESOLUTION_FAILED,
-                                   net_log);
+    list.UpdateRetryInfoOnFallback(
+        &retry_info_map, base::TimeDelta::FromSeconds(60), true, bad_proxies,
+        ERR_NAME_RESOLUTION_FAILED, net_log);
     EXPECT_TRUE(retry_info_map.end() != retry_info_map.find("foopy1:80"));
     EXPECT_EQ(ERR_NAME_RESOLUTION_FAILED,
               retry_info_map[proxy_server.ToURI()].net_error);
     EXPECT_TRUE(retry_info_map.end() == retry_info_map.find("foopy2:80"));
     EXPECT_TRUE(retry_info_map.end() != retry_info_map.find("foopy3:80"));
   }
   // If the first proxy is DIRECT, nothing is added to the retry list, even
   // if another bad proxy is specified.
   {
     ProxyList list;
     ProxyRetryInfoMap retry_info_map;
     BoundNetLog net_log;
     ProxyServer proxy_server = ProxyServer::FromURI("foopy2:80",
                                                     ProxyServer::SCHEME_HTTP);
+    std::vector<ProxyServer> bad_proxies;
+    bad_proxies.push_back(proxy_server);
     list.SetFromPacString("DIRECT;PROXY foopy2:80;PROXY foopy3:80");
     list.UpdateRetryInfoOnFallback(&retry_info_map,
-                                   base::TimeDelta::FromSeconds(60),
-                                   true,
-                                   proxy_server,
-                                   OK,
-                                   net_log);
+                                   base::TimeDelta::FromSeconds(60), true,
+                                   bad_proxies, OK, net_log);
     EXPECT_TRUE(retry_info_map.end() == retry_info_map.find("foopy2:80"));
     EXPECT_TRUE(retry_info_map.end() == retry_info_map.find("foopy3:80"));
   }
 }
 
 }  // namesapce
 
 }  // namespace net