Shorten the new proxy switch names.

chrome/browser/net/chrome_url_request_context.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/net/chrome_url_request_context.h"
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/extensions/extension.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "net/ftp/ftp_network_layer.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_util.h"
 #include "net/proxy/proxy_service.h"
 #include "webkit/glue/webkit_glue.h"
 
 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;
   for (size_t i = 0; i < arraysize(proxy_switches); i++) {
     if (command_line.HasSwitch(proxy_switches[i])) {
       found_enable_proxy_switch = true;
       break;
     }
   }
 
   if (!found_enable_proxy_switch &&
       !command_line.HasSwitch(switches::kNoProxyServer)) {
     return NULL;
   }
 
   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.";
     }
     return proxy_config;
   }
 
   if (command_line.HasSwitch(switches::kProxyServer)) {
     const std::wstring& proxy_server =
         command_line.GetSwitchValue(switches::kProxyServer);
     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;
 }
 
 // Create a proxy service according to the options on command line.
 static net::ProxyService* CreateProxyService(URLRequestContext* context,
                                              const CommandLine& command_line) {
   scoped_ptr<net::ProxyConfig> proxy_config(CreateProxyConfig(command_line));
 
@@ skipping 287 matching lines @@
   // Do not delete the cookie store in the case of the media context, as it is
   // owned by the original context.
   if (!is_media_)
     delete cookie_store_;
 
   // Do not delete the proxy service in the case of OTR or media contexts, as
   // it is owned by the original URLRequestContext.
   if (!is_off_the_record_ && !is_media_)
     delete proxy_service_;
 }