summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_config_service_linux_unittest.cc
diff options
context:
space:
mode:
authormdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-08 00:58:37 +0000
committermdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-08 00:58:37 +0000
commitbfeb7233a965b2220bccbcf7bdacb3f2765168d9 (patch)
treee4846147faa3a7e7d5e67dc09fdbdf1941a685b8 /net/proxy/proxy_config_service_linux_unittest.cc
parent81b919c7669f3ab92e55e415595bdaa131010fd4 (diff)
downloadchromium_src-bfeb7233a965b2220bccbcf7bdacb3f2765168d9.zip
chromium_src-bfeb7233a965b2220bccbcf7bdacb3f2765168d9.tar.gz
chromium_src-bfeb7233a965b2220bccbcf7bdacb3f2765168d9.tar.bz2
Linux: KDE: support recent KDE's socksProxy setting.
BUG=131556 Review URL: https://chromiumcodereview.appspot.com/10545073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141140 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_config_service_linux_unittest.cc')
-rw-r--r--net/proxy/proxy_config_service_linux_unittest.cc32
1 files changed, 32 insertions, 0 deletions
diff --git a/net/proxy/proxy_config_service_linux_unittest.cc b/net/proxy/proxy_config_service_linux_unittest.cc
index 0c292a5..d25dde9 100644
--- a/net/proxy/proxy_config_service_linux_unittest.cc
+++ b/net/proxy/proxy_config_service_linux_unittest.cc
@@ -1231,6 +1231,38 @@ TEST_F(ProxyConfigServiceLinuxTest, KDEConfigParser) {
},
{
+ TEST_DESC("socks"),
+
+ // Input.
+ "[Proxy Settings]\nProxyType=1\nsocksProxy=socks.com 888\n",
+ {}, // env_values
+
+ // Expected result.
+ ProxyConfigService::CONFIG_VALID,
+ false, // auto_detect
+ GURL(), // pac_url
+ ProxyRulesExpectation::Single(
+ "socks5://socks.com:888", // single proxy
+ ""), // bypass rules
+ },
+
+ {
+ TEST_DESC("socks4"),
+
+ // Input.
+ "[Proxy Settings]\nProxyType=1\nsocksProxy=socks4://socks.com 888\n",
+ {}, // env_values
+
+ // Expected result.
+ ProxyConfigService::CONFIG_VALID,
+ false, // auto_detect
+ GURL(), // pac_url
+ ProxyRulesExpectation::Single(
+ "socks4://socks.com:888", // single proxy
+ ""), // bypass rules
+ },
+
+ {
TEST_DESC("Treat all hostname patterns as wildcard patterns"),
// Input.