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

4 files changed, 9 insertions, 9 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);
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index a521514..f15fe33 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -239,11 +239,11 @@ const wchar_t kProxyServer[]                   = L"proxy-server";
 // other proxy server flags that are passed.
 const wchar_t kNoProxyServer[]                 = L"no-proxy-server";
 
-// Specify a list of URLs for whom we bypass proxy settings and use direct
+// Specify a list of hosts for whom we bypass proxy settings and use direct
 // connections. Ignored if --proxy-auto-detect or --no-proxy-server are
 // also specified.
-// TODO(robertshield): Specify URL format.
-const wchar_t kProxyBypassUrls[]         = L"proxy-bypass-urls";
+// TODO(robertshield): Specify host format.
+const wchar_t kProxyBypassList[]         = L"proxy-bypass-list";
 
 // Force proxy auto-detection.
 const wchar_t kProxyAutoDetect[]         = L"proxy-auto-detect";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index d304c78..a4782e1 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -79,7 +79,7 @@ extern const wchar_t kMakeDefaultBrowser[];
 
 extern const wchar_t kProxyServer[];
 extern const wchar_t kNoProxyServer[];
-extern const wchar_t kProxyBypassUrls[];
+extern const wchar_t kProxyBypassList[];
 extern const wchar_t kProxyAutoDetect[];
 extern const wchar_t kProxyPacUrl[];
 extern const wchar_t kWinHttpProxyResolver[];