Move the pretty-printing of proxy settings from the C++ code to javascript.

Also, the javascript version does some fancier output -- it now only displays the relevant fields, and numbers the fallback order.

Review URL: http://codereview.chromium.org/3219004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57949 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 174 deletions

diff --git a/net/proxy/proxy_config_unittest.cc b/net/proxy/proxy_config_unittest.cc
index 118e957..1947ce4 100644
--- a/net/proxy/proxy_config_unittest.cc
+++ b/net/proxy/proxy_config_unittest.cc
@@ -251,180 +251,6 @@ TEST(ProxyConfigTest, ParseProxyRules) {
   }
 }
 
-TEST(ProxyConfigTest, ToString) {
-  // Manual proxy.
-  {
-    ProxyConfig config;
-    config.set_auto_detect(false);
-    config.proxy_rules().ParseFromString("http://single-proxy:81");
-
-    EXPECT_EQ("Automatic settings:\n"
-              "  Auto-detect: No\n"
-              "  Custom PAC script: [None]\n"
-              "Manual settings:\n"
-              "  Proxy server: single-proxy:81\n"
-              "  Bypass list: [None]",
-              config.ToString());
-  }
-
-  // Autodetect + custom PAC + manual proxy.
-  {
-    ProxyConfig config;
-    config.set_auto_detect(true);
-    config.set_pac_url(GURL("http://custom/pac.js"));
-    config.proxy_rules().ParseFromString("http://single-proxy:81");
-
-    EXPECT_EQ("Automatic settings:\n"
-              "  Auto-detect: Yes\n"
-              "  Custom PAC script: http://custom/pac.js\n"
-              "Manual settings:\n"
-              "  Proxy server: single-proxy:81\n"
-              "  Bypass list: [None]",
-              config.ToString());
-  }
-
-  // Manual proxy with bypass list + bypass local.
-  {
-    ProxyConfig config;
-    config.set_auto_detect(false);
-    config.proxy_rules().ParseFromString("http://single-proxy:81");
-    config.proxy_rules().bypass_rules.AddRuleFromString("google.com");
-    config.proxy_rules().bypass_rules.AddRuleFromString("bypass2.net:1730");
-    config.proxy_rules().bypass_rules.AddRuleToBypassLocal();
-
-    EXPECT_EQ("Automatic settings:\n"
-              "  Auto-detect: No\n"
-              "  Custom PAC script: [None]\n"
-              "Manual settings:\n"
-              "  Proxy server: single-proxy:81\n"
-              "  Bypass list: \n"
-              "    google.com\n"
-              "    bypass2.net:1730\n"
-              "    <local>",
-              config.ToString());
-  }
-
-  // Proxy-per scheme (HTTP and HTTPS)
-  {
-    ProxyConfig config;
-    config.set_auto_detect(false);
-    config.proxy_rules().ParseFromString(
-        "http=proxy-for-http:1801; https=proxy-for-https:1802");
-
-    EXPECT_EQ("Automatic settings:\n"
-              "  Auto-detect: No\n"
-              "  Custom PAC script: [None]\n"
-              "Manual settings:\n"
-              "  Proxy server: \n"
-              "    HTTP: proxy-for-http:1801\n"
-              "    HTTPS: proxy-for-https:1802\n"
-              "  Bypass list: [None]",
-              config.ToString());
-  }
-
-  // Proxy-per scheme (HTTP and SOCKS)
-  {
-    ProxyConfig config;
-    config.set_auto_detect(false);
-    config.proxy_rules().ParseFromString(
-        "http=http://proxy-for-http:1801; socks=socks-server:6083");
-
-    EXPECT_EQ("Automatic settings:\n"
-              "  Auto-detect: No\n"
-              "  Custom PAC script: [None]\n"
-              "Manual settings:\n"
-              "  Proxy server: \n"
-              "    HTTP: proxy-for-http:1801\n"
-              "    (fallback): socks4://socks-server:6083\n"
-              "  Bypass list: [None]",
-              config.ToString());
-  }
-
-  // No proxy.
-  {
-    ProxyConfig config;
-    config.set_auto_detect(false);
-
-    EXPECT_EQ("Automatic settings:\n"
-              "  Auto-detect: No\n"
-              "  Custom PAC script: [None]\n"
-              "Manual settings:\n"
-              "  Proxy server: [None]\n"
-              "  Bypass list: [None]",
-              config.ToString());
-  }
-
-  // Manual proxy with bypass list + bypass local, list reversed.
-  {
-    ProxyConfig config;
-    config.set_auto_detect(false);
-    config.proxy_rules().ParseFromString("http://single-proxy:81");
-    config.proxy_rules().bypass_rules.AddRuleFromString("google.com");
-    config.proxy_rules().bypass_rules.AddRuleFromString("bypass2.net:1730");
-    config.proxy_rules().bypass_rules.AddRuleToBypassLocal();
-    config.proxy_rules().reverse_bypass = true;
-
-    EXPECT_EQ("Automatic settings:\n"
-              "  Auto-detect: No\n"
-              "  Custom PAC script: [None]\n"
-              "Manual settings:\n"
-              "  Proxy server: single-proxy:81\n"
-              "  Only use proxy for: \n"
-              "    google.com\n"
-              "    bypass2.net:1730\n"
-              "    <local>",
-              config.ToString());
-  }
-}
-
-TEST(ProxyConfigTest, MayRequirePACResolver) {
-  {
-    ProxyConfig config;
-    EXPECT_FALSE(config.MayRequirePACResolver());
-  }
-  {
-    ProxyConfig config;
-    config.set_auto_detect(true);
-    EXPECT_TRUE(config.MayRequirePACResolver());
-  }
-  {
-    ProxyConfig config;
-    config.set_pac_url(GURL("http://custom/pac.js"));
-    EXPECT_TRUE(config.MayRequirePACResolver());
-  }
-  {
-    ProxyConfig config;
-    config.set_pac_url(GURL("notvalid"));
-    EXPECT_FALSE(config.MayRequirePACResolver());
-  }
-}
-
-TEST(ProxyConfigTest, ReversedBypassList) {
-  {
-    ProxyConfig config;
-    config.set_auto_detect(false);
-    config.proxy_rules().ParseFromString("http://single-proxy:81");
-    config.proxy_rules().bypass_rules.AddRuleFromString("google.com");
-    config.proxy_rules().bypass_rules.AddRuleFromString("bypass2.net:1730");
-    config.proxy_rules().bypass_rules.AddRuleToBypassLocal();
-    config.proxy_rules().reverse_bypass = true;
-
-    ProxyInfo info[3];
-    GURL url0("http://google.com");
-    GURL url1("http://www.webkit.com");
-    GURL url2("http://bypass2.net:1730");
-
-    config.proxy_rules().Apply(url0, &info[0]);
-    EXPECT_EQ("single-proxy:81", info[0].proxy_server().ToURI());
-
-    config.proxy_rules().Apply(url1, &info[1]);
-    EXPECT_TRUE(info[1].is_direct());
-
-    config.proxy_rules().Apply(url2, &info[2]);
-    EXPECT_EQ("single-proxy:81", info[2].proxy_server().ToURI());
-  }
-}
-
 }  // namespace
 }  // namespace net