Shorten the new proxy switch names.

Review URL: http://codereview.chromium.org/113465

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16188 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 20 insertions, 20 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 {
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 018a6a6..d07c3e9 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -234,16 +234,16 @@ const wchar_t kProxyServer[]                   = L"proxy-server";
 const wchar_t kNoProxyServer[]                 = L"no-proxy-server";
 
 // Specify a list of URLs for whom we bypass proxy settings and use direct
-// connections. Ignored if proxy-server-auto-detect or no-proxy-server are
+// connections. Ignored if --proxy-auto-detect or --no-proxy-server are
 // also specified.
 // TODO(robertshield): Specify URL format.
-const wchar_t kProxyServerBypassUrls[]         = L"proxy-server-bypass-urls";
+const wchar_t kProxyBypassUrls[]         = L"proxy-bypass-urls";
 
 // Force proxy auto-detection.
-const wchar_t kProxyServerAutoDetect[]         = L"proxy-server-auto-detect";
+const wchar_t kProxyAutoDetect[]         = L"proxy-auto-detect";
 
 // Use the pac script at the given URL
-const wchar_t kProxyServerPacUrl[]             = L"proxy-server-pac-url";
+const wchar_t kProxyPacUrl[]             = L"proxy-pac-url";
 
 // Use WinHTTP to fetch and evaluate PAC scripts. Otherwise the default is
 // to use Chromium's network stack to fetch, and V8 to evaluate.
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index f987cb2..da3e0e4 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -77,9 +77,9 @@ extern const wchar_t kMakeDefaultBrowser[];
 
 extern const wchar_t kProxyServer[];
 extern const wchar_t kNoProxyServer[];
-extern const wchar_t kProxyServerBypassUrls[];
-extern const wchar_t kProxyServerAutoDetect[];
-extern const wchar_t kProxyServerPacUrl[];
+extern const wchar_t kProxyBypassUrls[];
+extern const wchar_t kProxyAutoDetect[];
+extern const wchar_t kProxyPacUrl[];
 extern const wchar_t kWinHttpProxyResolver[];
 extern const wchar_t kDebugPrint[];