Index: net/proxy/proxy_list_unittest.cc |
diff --git a/net/proxy/proxy_list_unittest.cc b/net/proxy/proxy_list_unittest.cc |
index a6bf07f4f1e40d9df7591ddca63608fabc0aac19..0dbb53a2d03ff3537c623028ee2c98f9decfeecf 100644 |
--- a/net/proxy/proxy_list_unittest.cc |
+++ b/net/proxy/proxy_list_unittest.cc |
@@ -4,6 +4,8 @@ |
#include "net/proxy/proxy_list.h" |
+#include <vector> |
+ |
#include "net/base/net_errors.h" |
#include "net/log/net_log.h" |
#include "net/proxy/proxy_retry_info.h" |
@@ -175,13 +177,12 @@ TEST(ProxyListTest, UpdateRetryInfoOnFallback) { |
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, |
- 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); |
@@ -196,13 +197,12 @@ TEST(ProxyListTest, UpdateRetryInfoOnFallback) { |
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")); |
@@ -216,13 +216,12 @@ TEST(ProxyListTest, UpdateRetryInfoOnFallback) { |
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); |
@@ -237,13 +236,12 @@ TEST(ProxyListTest, UpdateRetryInfoOnFallback) { |
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")); |
} |