summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net/chrome_url_request_context.cc
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-26 19:07:34 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-26 19:07:34 +0000
commit7a2319b876d956896afe33ce99edc4001cd324c7 (patch)
tree4ab3dfea76c7a106a92a2049ddd31eb9a8265703 /chrome/browser/net/chrome_url_request_context.cc
parent6eb7e132a6222068366e50a95a62281ebcbcfeb2 (diff)
downloadchromium_src-7a2319b876d956896afe33ce99edc4001cd324c7.zip
chromium_src-7a2319b876d956896afe33ce99edc4001cd324c7.tar.gz
chromium_src-7a2319b876d956896afe33ce99edc4001cd324c7.tar.bz2
Rename the --proxy-bypass-urls command-line switch
--proxy-bypass-list. R=robertshield,eroman BUG=http://crbug.com/266 TEST=N/A Review URL: http://codereview.chromium.org/115725 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16883 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/chrome_url_request_context.cc')
-rw-r--r--chrome/browser/net/chrome_url_request_context.cc6
1 files changed, 3 insertions, 3 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;