diff options
Diffstat (limited to 'chrome/browser/net')
-rw-r--r-- | chrome/browser/net/chrome_url_request_context.cc | 6 | ||||
-rw-r--r-- | chrome/browser/net/chrome_url_request_context_unittest.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index 42554ff..6a3f404 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -30,7 +30,7 @@ net::ProxyConfig* CreateProxyConfig(const CommandLine& command_line) { switches::kProxyServer, switches::kProxyPacUrl, switches::kProxyAutoDetect, - switches::kProxyBypassUrls + switches::kProxyBypassList }; bool found_enable_proxy_switch = false; @@ -73,10 +73,10 @@ net::ProxyConfig* CreateProxyConfig(const CommandLine& command_line) { proxy_config->auto_detect = true; } - if (command_line.HasSwitch(switches::kProxyBypassUrls)) { + if (command_line.HasSwitch(switches::kProxyBypassList)) { proxy_config->ParseNoProxyList( WideToASCII(command_line.GetSwitchValue( - switches::kProxyBypassUrls))); + switches::kProxyBypassList))); } return proxy_config; diff --git a/chrome/browser/net/chrome_url_request_context_unittest.cc b/chrome/browser/net/chrome_url_request_context_unittest.cc index e36f7c0..e756d79 100644 --- a/chrome/browser/net/chrome_url_request_context_unittest.cc +++ b/chrome/browser/net/chrome_url_request_context_unittest.cc @@ -32,13 +32,13 @@ TEST(ChromeUrlRequestContextTest, CreateProxyConfigTest) { per_scheme_proxy_bypass.AppendSwitchWithValue(switches::kProxyServer, L"http=httpproxy:8888;ftp=ftpproxy:8889"); per_scheme_proxy_bypass.AppendSwitchWithValue( - switches::kProxyBypassUrls, + switches::kProxyBypassList, L".google.com, foo.com:99, 1.2.3.4:22, 127.0.0.1/8"); CommandLine with_pac_url(L"foo.exe"); with_pac_url.AppendSwitchWithValue(switches::kProxyPacUrl, L"http://wpad/wpad.dat"); with_pac_url.AppendSwitchWithValue( - switches::kProxyBypassUrls, + switches::kProxyBypassList, L".google.com, foo.com:99, 1.2.3.4:22, 127.0.0.1/8"); CommandLine with_auto_detect(L"foo.exe"); with_auto_detect.AppendSwitch(switches::kProxyAutoDetect); |