diff options
| author | arindam@chromium.org <arindam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-14 05:23:30 +0000 |
|---|---|---|
| committer | arindam@chromium.org <arindam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-14 05:23:30 +0000 |
| commit | 87a102b1bd6d2e450f10ed0931c09ffcfef9a51c (patch) | |
| tree | 6877259bfdf9ec82c9952a1f66d9d450c037f331 /net/proxy/proxy_config_service_win_unittest.cc | |
| parent | 565243e032009b7022b49c085b1157c3fb4986d4 (diff) | |
| download | chromium_src-87a102b1bd6d2e450f10ed0931c09ffcfef9a51c.zip chromium_src-87a102b1bd6d2e450f10ed0931c09ffcfef9a51c.tar.gz chromium_src-87a102b1bd6d2e450f10ed0931c09ffcfef9a51c.tar.bz2 | |
Whenever proxy configurations contain socks and http/https/ftp proxies, socks configuration over rid the other proxies. Fixes the issue. Attached test cases.
BUG=15738
TEST=unittest (ProxyConfigTest.ParseProxyRules, ProxyServiceTest.DefaultProxyFallbackToSOCKS)
Review URL: http://codereview.chromium.org/149191
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20605 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_config_service_win_unittest.cc')
| -rw-r--r-- | net/proxy/proxy_config_service_win_unittest.cc | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/net/proxy/proxy_config_service_win_unittest.cc b/net/proxy/proxy_config_service_win_unittest.cc index c08b1a9..2b0ff66 100644 --- a/net/proxy/proxy_config_service_win_unittest.cc +++ b/net/proxy/proxy_config_service_win_unittest.cc @@ -108,6 +108,25 @@ TEST(ProxyConfigServiceWinTest, SetFromIEConfig) { false, // bypass_local_names }, + // SOCKS proxy configuration + { + { // Input. + FALSE, // fAutoDetect + NULL, // lpszAutoConfigUrl + L"http=www.google.com:80;https=www.foo.com:110;" + L"ftp=ftpproxy:20;socks=foopy:130", // lpszProxy + NULL, // lpszProxy_bypass + }, + + // Expected result. + false, // auto_detect + GURL(), // pac_url + MakeProxyPerSchemeRules("www.google.com:80", "www.foo.com:110", + "ftpproxy:20", "foopy:130"), + "", // proxy_bypass_list + false, // bypass_local_names + }, + // Bypass local names. { { // Input. |