Merge 34903, 34928, 35008, 35549, 36054 to the 249s branch....

net/proxy/proxy_list_unittest.cc

Index: net/proxy/proxy_list_unittest.cc
===================================================================
--- net/proxy/proxy_list_unittest.cc	(revision 37149)
+++ net/proxy/proxy_list_unittest.cc	(working copy)
@@ -5,6 +5,10 @@
 #include "net/proxy/proxy_list.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace net {
+
+namespace {
+
 // Test parsing from a PAC string.
 TEST(ProxyListTest, SetFromPacString) {
   const struct {
@@ -24,9 +28,20 @@
     {  "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",
     },
@@ -39,9 +54,10 @@
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
-    net::ProxyList list;
+    ProxyList list;
     list.SetFromPacString(tests[i].pac_input);
     EXPECT_EQ(tests[i].pac_output, list.ToPacString());
+    EXPECT_FALSE(list.IsEmpty());
   }
 }
 
@@ -53,20 +69,77 @@
   } tests[] = {
     {  "PROXY foopy:10 ; SOCKS5 foopy2 ; SOCKS foopy11 ; PROXY foopy3 ; DIRECT",
        // Remove anything that isn't HTTP or DIRECT.
-       net::ProxyServer::SCHEME_DIRECT | net::ProxyServer::SCHEME_HTTP,
+       ProxyServer::SCHEME_DIRECT | ProxyServer::SCHEME_HTTP,
        "PROXY foopy:10;PROXY foopy3:80;DIRECT",
     },
-    {  "PROXY foopy:10 | SOCKS5 foopy2",
+    {  "PROXY foopy:10 ; SOCKS5 foopy2",
        // Remove anything that isn't HTTP or SOCKS5.
-       net::ProxyServer::SCHEME_DIRECT | net::ProxyServer::SCHEME_SOCKS4,
-       "DIRECT",
+       ProxyServer::SCHEME_DIRECT | ProxyServer::SCHEME_SOCKS4,
+       "",
     },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
-    net::ProxyList list;
+    ProxyList list;
     list.SetFromPacString(tests[i].pac_input);
     list.RemoveProxiesWithoutScheme(tests[i].filter);
     EXPECT_EQ(tests[i].filtered_pac_output, list.ToPacString());
   }
 }
+
+TEST(ProxyListTest, DeprioritizeBadProxies) {
+  // Retry info that marks a proxy as being bad for a *very* long time (to avoid
+  // the test depending on the current time.)
+  ProxyRetryInfo proxy_retry_info;
+  proxy_retry_info.bad_until =
+      base::TimeTicks::Now() + base::TimeDelta::FromDays(1);
+
+  // Call DeprioritizeBadProxies with an empty map -- should have no effect.
+  {
+    ProxyList list;
+    list.SetFromPacString("PROXY foopy1:80;PROXY foopy2:80;PROXY foopy3:80");
+
+    ProxyRetryInfoMap retry_info_map;
+    list.DeprioritizeBadProxies(retry_info_map);
+    EXPECT_EQ("PROXY foopy1:80;PROXY foopy2:80;PROXY foopy3:80",
+              list.ToPacString());
+  }
+
+  // Call DeprioritizeBadProxies with 2 of the three proxies marked as bad.
+  // These proxies should be retried last.
+  {
+    ProxyList list;
+    list.SetFromPacString("PROXY foopy1:80;PROXY foopy2:80;PROXY foopy3:80");
+
+    ProxyRetryInfoMap retry_info_map;
+    retry_info_map["foopy1:80"] = proxy_retry_info;
+    retry_info_map["foopy3:80"] = proxy_retry_info;
+    retry_info_map["socks5://localhost:1080"] = proxy_retry_info;
+
+    list.DeprioritizeBadProxies(retry_info_map);
+
+    EXPECT_EQ("PROXY foopy2:80;PROXY foopy1:80;PROXY foopy3:80",
+              list.ToPacString());
+  }
+
+  // Call DeprioritizeBadProxies where ALL of the proxies are marked as bad.
+  // This should have no effect on the order.
+  {
+    ProxyList list;
+    list.SetFromPacString("PROXY foopy1:80;PROXY foopy2:80;PROXY foopy3:80");
+
+    ProxyRetryInfoMap retry_info_map;
+    retry_info_map["foopy1:80"] = proxy_retry_info;
+    retry_info_map["foopy2:80"] = proxy_retry_info;
+    retry_info_map["foopy3:80"] = proxy_retry_info;
+
+    list.DeprioritizeBadProxies(retry_info_map);
+
+    EXPECT_EQ("PROXY foopy1:80;PROXY foopy2:80;PROXY foopy3:80",
+              list.ToPacString());
+  }
+}
+
+}  // namesapce
+
+}  // namespace net
Property changes on: net\proxy\proxy_list_unittest.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/net/proxy/proxy_list_unittest.cc:r34903,34928,35008,35549,36054