diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-28 00:16:17 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-28 00:16:17 +0000 |
| commit | e8c5081971797d743bce0d9433201601b568a08b (patch) | |
| tree | 6e6a9eddd5bf4a60849e4c1742731a88d9c196fa /net/proxy/proxy_config_service_linux_unittest.cc | |
| parent | 5da568510aec003857ae4223546e5bd5cd332e97 (diff) | |
| download | chromium_src-e8c5081971797d743bce0d9433201601b568a08b.zip chromium_src-e8c5081971797d743bce0d9433201601b568a08b.tar.gz chromium_src-e8c5081971797d743bce0d9433201601b568a08b.tar.bz2 | |
Change the default SOCKS version used by gnome settings (and environment variables) to be 5 instead of 4.
BUG=56833
TEST=Open Chrome in gnome. Go to change the proxy settings (which will pop open the gnome network settings). Enter as socks proxy server, "localhost:8080". Now load chrome://net-internals/#proxy and verify that it says the proxy server is "socks5://localhost:8080" (and NOT socks4://localhost:8080).
Review URL: http://codereview.chromium.org/3413037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60734 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.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/proxy/proxy_config_service_linux_unittest.cc b/net/proxy/proxy_config_service_linux_unittest.cc index 41fe7d2..2cb1259 100644 --- a/net/proxy/proxy_config_service_linux_unittest.cc +++ b/net/proxy/proxy_config_service_linux_unittest.cc @@ -582,7 +582,7 @@ TEST_F(ProxyConfigServiceLinuxTest, BasicGConfTest) { false, // auto_detect GURL(), // pac_url ProxyRulesExpectation::Single( - "socks4://socks.com:99", // single proxy + "socks5://socks.com:99", // single proxy "") // bypass rules }, @@ -825,12 +825,12 @@ TEST_F(ProxyConfigServiceLinuxTest, BasicEnvTest) { false, // auto_detect GURL(), // pac_url ProxyRulesExpectation::Single( - "socks4://socks.com:888", // single proxy + "socks5://socks.com:888", // single proxy ""), // bypass rules }, { - TEST_DESC("socks5"), + TEST_DESC("socks4"), { // Input. NULL, // DESKTOP_SESSION NULL, // HOME @@ -839,7 +839,7 @@ TEST_F(ProxyConfigServiceLinuxTest, BasicEnvTest) { NULL, // auto_proxy "", // all_proxy NULL, NULL, NULL, // per-proto proxies - "socks.com:888", "5", // SOCKS + "socks.com:888", "4", // SOCKS NULL, // no_proxy }, @@ -847,7 +847,7 @@ TEST_F(ProxyConfigServiceLinuxTest, BasicEnvTest) { false, // auto_detect GURL(), // pac_url ProxyRulesExpectation::Single( - "socks5://socks.com:888", // single proxy + "socks4://socks.com:888", // single proxy ""), // bypass rules }, @@ -869,7 +869,7 @@ TEST_F(ProxyConfigServiceLinuxTest, BasicEnvTest) { false, // auto_detect GURL(), // pac_url ProxyRulesExpectation::Single( - "socks4://socks.com:1080", // single proxy + "socks5://socks.com:1080", // single proxy ""), // bypass rules }, |