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_common_unittest.h | |
| 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_common_unittest.h')
| -rw-r--r-- | net/proxy/proxy_config_service_common_unittest.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/proxy/proxy_config_service_common_unittest.h b/net/proxy/proxy_config_service_common_unittest.h index 08487ec..783fc6f 100644 --- a/net/proxy/proxy_config_service_common_unittest.h +++ b/net/proxy/proxy_config_service_common_unittest.h @@ -19,7 +19,8 @@ ProxyConfig::ProxyRules MakeProxyRules( const char* single_proxy, const char* proxy_for_http, const char* proxy_for_https, - const char* proxy_for_ftp); + const char* proxy_for_ftp, + const char* socks_proxy); ProxyConfig::ProxyRules MakeSingleProxyRules(const char* single_proxy); @@ -28,6 +29,12 @@ ProxyConfig::ProxyRules MakeProxyPerSchemeRules( const char* proxy_https, const char* proxy_ftp); +ProxyConfig::ProxyRules MakeProxyPerSchemeRules( + const char* proxy_http, + const char* proxy_https, + const char* proxy_ftp, + const char* socks_proxy); + typedef std::vector<std::string> BypassList; // Joins the proxy bypass list using "\n" to make it into a single string. |