| Index: net/proxy/proxy_list_unittest.cc
|
| diff --git a/net/proxy/proxy_list_unittest.cc b/net/proxy/proxy_list_unittest.cc
|
| index e98d9c519771f3b9f4b341bfb255d1932e498ca9..bc06dd50a711bc8ce34171c01afbce225f34c580 100644
|
| --- a/net/proxy/proxy_list_unittest.cc
|
| +++ b/net/proxy/proxy_list_unittest.cc
|
| @@ -181,7 +181,7 @@ TEST(ProxyListTest, UpdateRetryInfoOnFallback) {
|
| 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, bad_proxies,
|
| + 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,
|
| @@ -200,7 +200,7 @@ TEST(ProxyListTest, UpdateRetryInfoOnFallback) {
|
| 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,
|
| + list.UpdateRetryInfoOnFallback(retry_info_map,
|
| base::TimeDelta::FromSeconds(60), true,
|
| bad_proxies, OK, net_log);
|
| EXPECT_TRUE(retry_info_map.end() != retry_info_map.find("foopy1:80"));
|
| @@ -220,7 +220,7 @@ TEST(ProxyListTest, UpdateRetryInfoOnFallback) {
|
| 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, bad_proxies,
|
| + 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,
|
| @@ -239,7 +239,7 @@ TEST(ProxyListTest, UpdateRetryInfoOnFallback) {
|
| 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,
|
| + list.UpdateRetryInfoOnFallback(retry_info_map,
|
| base::TimeDelta::FromSeconds(60), true,
|
| bad_proxies, OK, net_log);
|
| EXPECT_TRUE(retry_info_map.end() == retry_info_map.find("foopy2:80"));
|
| @@ -256,12 +256,12 @@ TEST(ProxyListTest, UpdateRetryInfoOnFallback) {
|
|
|
| // First, mark the proxy as bad for 60 seconds.
|
| list.UpdateRetryInfoOnFallback(
|
| - &retry_info_map, base::TimeDelta::FromSeconds(60), true,
|
| + retry_info_map, base::TimeDelta::FromSeconds(60), true,
|
| std::vector<ProxyServer>(), ERR_PROXY_CONNECTION_FAILED, net_log);
|
| // Next, mark the same proxy as bad for 1 second. This call should have no
|
| // effect, since this would cause the bad proxy to be retried sooner than
|
| // the existing retry info.
|
| - list.UpdateRetryInfoOnFallback(&retry_info_map,
|
| + list.UpdateRetryInfoOnFallback(retry_info_map,
|
| base::TimeDelta::FromSeconds(1), false,
|
| std::vector<ProxyServer>(), OK, net_log);
|
| EXPECT_TRUE(retry_info_map.end() != retry_info_map.find("foopy1:80"));
|
| @@ -285,13 +285,13 @@ TEST(ProxyListTest, UpdateRetryInfoOnFallback) {
|
| list.SetFromPacString("PROXY foopy1:80;PROXY foopy2:80;PROXY foopy3:80");
|
|
|
| // First, mark the proxy as bad for 1 second.
|
| - list.UpdateRetryInfoOnFallback(&retry_info_map,
|
| + list.UpdateRetryInfoOnFallback(retry_info_map,
|
| base::TimeDelta::FromSeconds(1), false,
|
| std::vector<ProxyServer>(), OK, net_log);
|
| // Next, mark the same proxy as bad for 60 seconds. This call should replace
|
| // the existing retry info with the new 60 second retry info.
|
| list.UpdateRetryInfoOnFallback(
|
| - &retry_info_map, base::TimeDelta::FromSeconds(60), true,
|
| + retry_info_map, base::TimeDelta::FromSeconds(60), true,
|
| std::vector<ProxyServer>(), ERR_PROXY_CONNECTION_FAILED, net_log);
|
|
|
| EXPECT_TRUE(retry_info_map.end() != retry_info_map.find("foopy1:80"));
|
|
|