diff options
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/net/chrome_url_request_context.cc | 18 | ||||
| -rw-r--r-- | chrome/browser/net/chrome_url_request_context_unittest.cc | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index 1c18ed4..06b3739 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -28,9 +28,9 @@ net::ProxyConfig* CreateProxyConfig(const CommandLine& command_line) { // Scan for all "enable" type proxy switches. static const wchar_t* proxy_switches[] = { switches::kProxyServer, - switches::kProxyServerPacUrl, - switches::kProxyServerAutoDetect, - switches::kProxyServerBypassUrls + switches::kProxyPacUrl, + switches::kProxyAutoDetect, + switches::kProxyBypassUrls }; bool found_enable_proxy_switch = false; @@ -49,7 +49,7 @@ net::ProxyConfig* CreateProxyConfig(const CommandLine& command_line) { net::ProxyConfig* proxy_config = new net::ProxyConfig(); if (command_line.HasSwitch(switches::kNoProxyServer)) { // Ignore (and warn about) all the other proxy config switches we get if - // the no-proxy-server command line argument is present. + // the --no-proxy-server command line argument is present. if (found_enable_proxy_switch) { LOG(WARNING) << "Additional command line proxy switches found when --" << switches::kNoProxyServer << " was specified."; @@ -63,20 +63,20 @@ net::ProxyConfig* CreateProxyConfig(const CommandLine& command_line) { proxy_config->proxy_rules.ParseFromString(WideToASCII(proxy_server)); } - if (command_line.HasSwitch(switches::kProxyServerPacUrl)) { + if (command_line.HasSwitch(switches::kProxyPacUrl)) { proxy_config->pac_url = GURL(WideToASCII(command_line.GetSwitchValue( - switches::kProxyServerPacUrl))); + switches::kProxyPacUrl))); } - if (command_line.HasSwitch(switches::kProxyServerAutoDetect)) { + if (command_line.HasSwitch(switches::kProxyAutoDetect)) { proxy_config->auto_detect = true; } - if (command_line.HasSwitch(switches::kProxyServerBypassUrls)) { + if (command_line.HasSwitch(switches::kProxyBypassUrls)) { proxy_config->ParseNoProxyList( WideToASCII(command_line.GetSwitchValue( - switches::kProxyServerBypassUrls))); + switches::kProxyBypassUrls))); } 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 e74e7a8..e36f7c0 100644 --- a/chrome/browser/net/chrome_url_request_context_unittest.cc +++ b/chrome/browser/net/chrome_url_request_context_unittest.cc @@ -32,16 +32,16 @@ TEST(ChromeUrlRequestContextTest, CreateProxyConfigTest) { per_scheme_proxy_bypass.AppendSwitchWithValue(switches::kProxyServer, L"http=httpproxy:8888;ftp=ftpproxy:8889"); per_scheme_proxy_bypass.AppendSwitchWithValue( - switches::kProxyServerBypassUrls, + switches::kProxyBypassUrls, 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::kProxyServerPacUrl, + with_pac_url.AppendSwitchWithValue(switches::kProxyPacUrl, L"http://wpad/wpad.dat"); with_pac_url.AppendSwitchWithValue( - switches::kProxyServerBypassUrls, + switches::kProxyBypassUrls, 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::kProxyServerAutoDetect); + with_auto_detect.AppendSwitch(switches::kProxyAutoDetect); // Inspired from proxy_config_service_win_unittest.cc. const struct { |