Merge 183832

chrome/common/chrome_switches.h

 // Copyright (c) 2012 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.
 
 // Defines all the command-line switches used by Chrome.
 
 #ifndef CHROME_COMMON_CHROME_SWITCHES_H_
 #define CHROME_COMMON_CHROME_SWITCHES_H_
 
 #include "build/build_config.h"
@@ skipping 308 matching lines @@
 extern const char kShowAutofillTypePredictions[];
 extern const char kShowComponentExtensionOptions[];
 extern const char kShowIcons[];
 extern const char kShowLauncherAlignmentMenu[];
 extern const char kSilentDumpOnDCHECK[];
 extern const char kSimulateUpgrade[];
 extern const char kSocketReusePolicy[];
 extern const char kSpeculativeResourcePrefetching[];
 extern const char kSpeculativeResourcePrefetchingDisabled[];
 extern const char kSpeculativeResourcePrefetchingLearning[];
-extern const char kSpdyProxyOrigin[];
+extern const char kSpdyProxyAuthOrigin[];
 extern const char kSpeculativeResourcePrefetchingEnabled[];
 extern const char kSSLVersionMax[];
 extern const char kSSLVersionMin[];
 extern const char kStartMaximized[];
 extern const char kSuggestionNtpFilterWidth[];
 extern const char kSuggestionNtpGaussianFilter[];
 extern const char kSuggestionNtpLinearFilter[];
 extern const char kSyncAllowInsecureXmppConnection[];
 extern const char kSyncInvalidateXmppLogin[];
 extern const char kSyncKeystoreEncryption[];
@@ skipping 30 matching lines @@
 extern const char kWhitelistedExtensionID[];
 extern const char kWindowPosition[];
 extern const char kWindowSize[];
 extern const char kWinHttpProxyResolver[];
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 extern const char kPluginsMetadataServerURL[];
 #endif
 
 #if defined(OS_ANDROID)
-extern const char kEnableSpdyProxy[];
+extern const char kEnableSpdyProxyAuth[];
 extern const char kEnableTranslate[];
 extern const char kTabletUI[];
 #endif
 
 #if defined(USE_ASH)
 extern const char kAshEnableTabScrubbing[];
 extern const char kOpenAsh[];
 #endif
 
 #if defined(OS_CHROMEOS)
@@ skipping 82 matching lines @@
 #else
 extern const char kEnablePrintPreview[];
 #endif
 
 // DON'T ADD RANDOM STUFF HERE. Put it in the main section above in
 // alphabetical order, or in one of the ifdefs (also in order in each section).
 
 }  // namespace switches
 
 #endif  // CHROME_COMMON_CHROME_SWITCHES_H_