Policy: Add ProxyMode and deprecate ProxyServerMode.

chrome/common/policy_constants.cc

 // Copyright (c) 2010 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/common/policy_constants.h"
 
 namespace policy {
 
 #if defined(OS_WIN)
 #if defined(GOOGLE_CHROME_BUILD)
@@ skipping 16 matching lines @@
     "DefaultSearchProviderSearchURL";
 const char kDefaultSearchProviderSuggestURL[] =
     "DefaultSearchProviderSuggestURL";
 const char kDefaultSearchProviderInstantURL[] =
     "DefaultSearchProviderInstantURL";
 const char kDefaultSearchProviderIconURL[] =
     "DefaultSearchProviderIconURL";
 const char kDefaultSearchProviderEncodings[] =
     "DefaultSearchProviderEncodings";
 const char kDisableSpdy[] = "DisableSpdy";
-// We consider the name ProxyMode more apt than ProxyServerMode but could
-// not change it after publishing that name for the win registry and policy
-// config files.
-const char kProxyMode[] = "ProxyServerMode";
+const char kProxyMode[] = "ProxyMode";
+// Deprecated name of policy to set proxy server mode
+const char kProxyServerMode[] = "ProxyServerMode";
 const char kProxyServer[] = "ProxyServer";
 const char kProxyPacUrl[] = "ProxyPacUrl";
 const char kProxyBypassList[] = "ProxyBypassList";
 const char kAlternateErrorPagesEnabled[] = "AlternateErrorPagesEnabled";
 const char kSearchSuggestEnabled[] = "SearchSuggestEnabled";
 const char kDnsPrefetchingEnabled[] = "DnsPrefetchingEnabled";
 const char kSafeBrowsingEnabled[] = "SafeBrowsingEnabled";
 const char kMetricsReportingEnabled[] = "MetricsReportingEnabled";
 const char kPasswordManagerEnabled[] = "PasswordManagerEnabled";
 const char kPasswordManagerAllowShowPasswords[] =
@@ skipping 34 matching lines @@
 const char kChromeFrameContentTypes[] = "ChromeFrameContentTypes";
 
 #if defined(OS_CHROMEOS)
 // ChromeOS policy constants
 const char kChromeOsLockOnIdleSuspend[] = "ChromeOsLockOnIdleSuspend";
 #endif
 
 }  // namespace key
 
 }  // namespace policy