Index: net/proxy/proxy_list_unittest.cc |
diff --git a/net/proxy/proxy_list_unittest.cc b/net/proxy/proxy_list_unittest.cc |
index 9ccf9c4e4f795cfdd6cbb86d58e4634fc35ccdf7..58c60ae9f32027c10e93b845d435c6e01d4d5efb 100644 |
--- a/net/proxy/proxy_list_unittest.cc |
+++ b/net/proxy/proxy_list_unittest.cc |
@@ -19,43 +19,48 @@ TEST(ProxyListTest, SetFromPacString) { |
const char* pac_input; |
const char* pac_output; |
} tests[] = { |
- // Valid inputs: |
- { "PROXY foopy:10", |
- "PROXY foopy:10", |
- }, |
- { " DIRECT", // leading space. |
- "DIRECT", |
- }, |
- { "PROXY foopy1 ; proxy foopy2;\t DIRECT", |
- "PROXY foopy1:80;PROXY foopy2:80;DIRECT", |
- }, |
- { "proxy foopy1 ; SOCKS foopy2", |
- "PROXY foopy1:80;SOCKS foopy2:1080", |
- }, |
- // Try putting DIRECT first. |
- { "DIRECT ; proxy foopy1 ; DIRECT ; SOCKS5 foopy2;DIRECT ", |
- "DIRECT;PROXY foopy1:80;DIRECT;SOCKS5 foopy2:1080;DIRECT", |
- }, |
- // Try putting DIRECT consecutively. |
- { "DIRECT ; proxy foopy1:80; DIRECT ; DIRECT", |
- "DIRECT;PROXY foopy1:80;DIRECT;DIRECT", |
- }, |
- |
- // Invalid inputs (parts which aren't understood get |
- // silently discarded): |
- // |
- // If the proxy list string parsed to empty, automatically fall-back to |
- // DIRECT. |
- { "PROXY-foopy:10", |
- "DIRECT", |
- }, |
- { "PROXY", |
- "DIRECT", |
- }, |
- { "PROXY foopy1 ; JUNK ; JUNK ; SOCKS5 foopy2 ; ;", |
- "PROXY foopy1:80;SOCKS5 foopy2:1080", |
- }, |
- }; |
+ // Valid inputs: |
+ { |
+ "PROXY foopy:10", "PROXY foopy:10", |
+ }, |
+ { |
+ " DIRECT", // leading space. |
+ "DIRECT", |
+ }, |
+ { |
+ "PROXY foopy1 ; proxy foopy2;\t DIRECT", |
+ "PROXY foopy1:80;PROXY foopy2:80;DIRECT", |
+ }, |
+ { |
+ "proxy foopy1 ; SOCKS foopy2", "PROXY foopy1:80;SOCKS foopy2:1080", |
+ }, |
+ // Try putting DIRECT first. |
+ { |
+ "DIRECT ; proxy foopy1 ; DIRECT ; SOCKS5 foopy2;DIRECT ", |
+ "DIRECT;PROXY foopy1:80;DIRECT;SOCKS5 foopy2:1080;DIRECT", |
+ }, |
+ // Try putting DIRECT consecutively. |
+ { |
+ "DIRECT ; proxy foopy1:80; DIRECT ; DIRECT", |
+ "DIRECT;PROXY foopy1:80;DIRECT;DIRECT", |
+ }, |
+ |
+ // Invalid inputs (parts which aren't understood get |
+ // silently discarded): |
+ // |
+ // If the proxy list string parsed to empty, automatically fall-back to |
+ // DIRECT. |
+ { |
+ "PROXY-foopy:10", "DIRECT", |
+ }, |
+ { |
+ "PROXY", "DIRECT", |
+ }, |
+ { |
+ "PROXY foopy1 ; JUNK ; JUNK ; SOCKS5 foopy2 ; ;", |
+ "PROXY foopy1:80;SOCKS5 foopy2:1080", |
+ }, |
+ }; |
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) { |
ProxyList list; |
@@ -71,17 +76,19 @@ TEST(ProxyListTest, RemoveProxiesWithoutScheme) { |
int filter; |
const char* filtered_pac_output; |
} tests[] = { |
- { "PROXY foopy:10 ; SOCKS5 foopy2 ; SOCKS foopy11 ; PROXY foopy3 ; DIRECT", |
- // Remove anything that isn't HTTP or DIRECT. |
- ProxyServer::SCHEME_DIRECT | ProxyServer::SCHEME_HTTP, |
- "PROXY foopy:10;PROXY foopy3:80;DIRECT", |
- }, |
- { "PROXY foopy:10 ; SOCKS5 foopy2", |
- // Remove anything that isn't HTTP or SOCKS5. |
- ProxyServer::SCHEME_DIRECT | ProxyServer::SCHEME_SOCKS4, |
- "", |
- }, |
- }; |
+ { |
+ "PROXY foopy:10 ; SOCKS5 foopy2 ; SOCKS foopy11 ; PROXY foopy3 ; " |
+ "DIRECT", |
+ // Remove anything that isn't HTTP or DIRECT. |
+ ProxyServer::SCHEME_DIRECT | ProxyServer::SCHEME_HTTP, |
+ "PROXY foopy:10;PROXY foopy3:80;DIRECT", |
+ }, |
+ { |
+ "PROXY foopy:10 ; SOCKS5 foopy2", |
+ // Remove anything that isn't HTTP or SOCKS5. |
+ ProxyServer::SCHEME_DIRECT | ProxyServer::SCHEME_SOCKS4, "", |
+ }, |
+ }; |
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) { |
ProxyList list; |
@@ -160,8 +167,7 @@ TEST(ProxyListTest, DeprioritizeBadProxies) { |
list.DeprioritizeBadProxies(retry_info_map); |
- EXPECT_EQ("PROXY foopy2:80;PROXY foopy1:80", |
- list.ToPacString()); |
+ EXPECT_EQ("PROXY foopy2:80;PROXY foopy1:80", list.ToPacString()); |
} |
} |
@@ -188,8 +194,8 @@ TEST(ProxyListTest, UpdateRetryInfoOnFallback) { |
ProxyList list; |
ProxyRetryInfoMap retry_info_map; |
BoundNetLog net_log; |
- ProxyServer proxy_server = ProxyServer::FromURI("foopy3:80", |
- ProxyServer::SCHEME_HTTP); |
+ ProxyServer proxy_server = |
+ ProxyServer::FromURI("foopy3:80", ProxyServer::SCHEME_HTTP); |
list.SetFromPacString("PROXY foopy1:80;PROXY foopy2:80;PROXY foopy3:80"); |
list.UpdateRetryInfoOnFallback(&retry_info_map, |
base::TimeDelta::FromSeconds(60), |
@@ -206,8 +212,8 @@ TEST(ProxyListTest, UpdateRetryInfoOnFallback) { |
ProxyList list; |
ProxyRetryInfoMap retry_info_map; |
BoundNetLog net_log; |
- ProxyServer proxy_server = ProxyServer::FromURI("foopy2:80", |
- ProxyServer::SCHEME_HTTP); |
+ ProxyServer proxy_server = |
+ ProxyServer::FromURI("foopy2:80", ProxyServer::SCHEME_HTTP); |
list.SetFromPacString("DIRECT;PROXY foopy2:80;PROXY foopy3:80"); |
list.UpdateRetryInfoOnFallback(&retry_info_map, |
base::TimeDelta::FromSeconds(60), |