Shorten the new proxy switch names.

chrome/browser/net/chrome_url_request_context.cc

Index: chrome/browser/net/chrome_url_request_context.cc
===================================================================
--- chrome/browser/net/chrome_url_request_context.cc	(revision 16082)
+++ chrome/browser/net/chrome_url_request_context.cc	(working copy)
@@ -27,9 +27,9 @@
   // 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;
@@ -48,7 +48,7 @@
   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.";
@@ -62,20 +62,20 @@
     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;