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

Unified Diff: net/proxy/proxy_list_unittest.cc

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.cc ('k') | net/proxy/proxy_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"));
}
« no previous file with comments | « net/proxy/proxy_list.cc ('k') | net/proxy/proxy_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698