Get rid of webkit/plugins/plugin_switches.* and move them to content/public/common/content_switches…

content/public/common/content_switches.h

Index: content/public/common/content_switches.h
===================================================================
--- content/public/common/content_switches.h	(revision 216485)
+++ content/public/common/content_switches.h	(working copy)
@@ -12,149 +12,154 @@
 
 namespace switches {
 
+// All switches in alphabetical order. The switches should be documented
+// alongside the definition of their values in the .cc file.
 CONTENT_EXPORT extern const char kAllowFileAccessFromFiles[];
+CONTENT_EXPORT extern const char kAllowNoSandboxJob[];
 extern const char kAllowSandboxDebugging[];
 extern const char kAllowWebUICompositing[];
-extern const char kAuditHandles[];
 extern const char kAuditAllHandles[];
+extern const char kAuditHandles[];
+CONTENT_EXPORT extern const char kBlacklistAcceleratedCompositing[];
+CONTENT_EXPORT extern const char kBlacklistWebGL[];
 CONTENT_EXPORT extern const char kBrowserAssertTest[];
 CONTENT_EXPORT extern const char kBrowserCrashTest[];
 CONTENT_EXPORT extern const char kBrowserSubprocessPath[];
+extern const char kDebugPluginLoading[];
+extern const char kDefaultTileWidth[];
+extern const char kDefaultTileHeight[];
 CONTENT_EXPORT extern const char kDisable2dCanvasAntialiasing[];
-CONTENT_EXPORT extern const char kEnableExperimentalCanvasFeatures[];
 CONTENT_EXPORT extern const char kDisable3DAPIs[];
 CONTENT_EXPORT extern const char kDisableAccelerated2dCanvas[];
 CONTENT_EXPORT extern const char kDisableAcceleratedCompositing[];
+CONTENT_EXPORT extern const char kDisableAcceleratedFixedRootBackground[];
 CONTENT_EXPORT extern const char kDisableAcceleratedLayers[];
+extern const char kDisableAcceleratedOverflowScroll[];
 CONTENT_EXPORT extern const char kDisableAcceleratedPlugins[];
 CONTENT_EXPORT extern const char kDisableAcceleratedVideo[];
+CONTENT_EXPORT extern const char kDisableAcceleratedVideoDecode[];
 CONTENT_EXPORT extern const char kDisableAltWinstation[];
 CONTENT_EXPORT extern const char kDisableApplicationCache[];
 CONTENT_EXPORT extern const char kDisableAudio[];
 extern const char kDisableBackingStoreLimit[];
+CONTENT_EXPORT extern const char kDisableBrowserPluginCompositing[];
+CONTENT_EXPORT extern const char kDisableCompositingForFixedPosition[];
+CONTENT_EXPORT extern const char kDisableCompositingForTransition[];
 CONTENT_EXPORT extern const char kDisableDatabases[];
+CONTENT_EXPORT extern const char kDisableDelegatedRenderer[];
 extern const char kDisableDesktopNotifications[];
 CONTENT_EXPORT extern const char kDisableDeviceOrientation[];
 CONTENT_EXPORT extern const char kDisableExperimentalWebGL[];
-CONTENT_EXPORT extern const char kBlacklistAcceleratedCompositing[];
-CONTENT_EXPORT extern const char kBlacklistWebGL[];
 extern const char kDisableFileSystem[];
+CONTENT_EXPORT extern const char kDisableFixedPositionCreatesStackingContext[];
 CONTENT_EXPORT extern const char kDisableFlash3d[];
 CONTENT_EXPORT extern const char kDisableFlashStage3d[];
 CONTENT_EXPORT extern const char kDisableForceCompositingMode[];
+CONTENT_EXPORT extern const char kDisableFullScreen[];
 extern const char kDisableGeolocation[];
-CONTENT_EXPORT extern const char kUseGpuInTests[];
-extern const char kDisableGpu[];
+CONTENT_EXPORT extern const char kDisableGestureTapHighlight[];
 CONTENT_EXPORT extern const char kDisableGLMultisampling[];
+extern const char kDisableGpu[];
+CONTENT_EXPORT extern const char kDisableGpuCompositing[];
 CONTENT_EXPORT extern const char kDisableGpuProcessPrelaunch[];
 extern const char kDisableGpuSandbox[];
-extern const char kReduceGpuSandbox[];
-CONTENT_EXPORT extern const char kDisableGpuCompositing[];
 extern const char kDisableGpuWatchdog[];
 CONTENT_EXPORT extern const char kDisableHangMonitor[];
-CONTENT_EXPORT extern const char kDisableHTMLNotifications[];
 extern const char kDisableHistogramCustomizer[];
+CONTENT_EXPORT extern const char kDisableHTMLNotifications[];
 extern const char kDisableImageTransportSurface[];
 CONTENT_EXPORT extern const char kDisableJava[];
 CONTENT_EXPORT extern const char kDisableJavaScript[];
+extern const char kDisableLegacyEncryptedMedia[];
 CONTENT_EXPORT extern const char kDisableLocalStorage[];
 CONTENT_EXPORT extern const char kDisableLogging[];
-CONTENT_EXPORT extern const char kLogNetLog[];
-CONTENT_EXPORT extern const char kDisableSmoothScrolling[];
+extern const char kDisablePepper3d[];
+extern const char kDisablePinch[];
 CONTENT_EXPORT extern const char kDisablePlugins[];
+CONTENT_EXPORT extern const char kDisablePluginsDiscovery[];
 extern const char kDisableRemoteFonts[];
 extern const char kDisableRendererAccessibility[];
-extern const char kDisableSSLFalseStart[];
 extern const char kDisableSeccompFilterSandbox[];
 extern const char kDisableSessionStorage[];
 extern const char kDisableSetuidSandbox[];
 extern const char kDisableSharedWorkers[];
 extern const char kDisableSiteSpecificQuirks[];
+CONTENT_EXPORT extern const char kDisableSmoothScrolling[];
+CONTENT_EXPORT extern const char kDisableSoftwareRasterizer[];
 CONTENT_EXPORT extern const char kDisableSpeechInput[];
-extern const char kSpeechRecognitionWebserviceKey[];
-CONTENT_EXPORT extern const char kEnableSpeechSynthesis[];
-#if defined(OS_ANDROID)
-CONTENT_EXPORT extern const char kDisableWebRTC[];
-CONTENT_EXPORT extern const char kEnableSpeechRecognition[];
-#endif
+extern const char kDisableSSLFalseStart[];
+CONTENT_EXPORT extern const char kDisableThreadedCompositing[];
+CONTENT_EXPORT extern const char kDisableThreadedHTMLParser[];
 CONTENT_EXPORT extern const char kDisableWebAudio[];
-#if defined(ENABLE_WEBRTC)
-CONTENT_EXPORT extern const char kDisableDeviceEnumeration[];
-CONTENT_EXPORT extern const char kEnableSCTPDataChannels[];
-extern const char kEnableWebRtcAecRecordings[];
-extern const char kEnableWebRtcHWDecoding[];
-#endif
-extern const char kEnableWebRtcTcpServerSocket[];
-extern const char kEnableWebAnimationsCSS[];
-extern const char kEnableWebAnimationsSVG[];
-extern const char kEnableWebMIDI[];
+extern const char kDisableWebKitMediaSource[];
 extern const char kDisableWebSecurity[];
-extern const char kEnableExperimentalWebSocket[];
-extern const char kEnableHTMLImports[];
 extern const char kDisableXSSAuditor[];
 CONTENT_EXPORT extern const char kDomAutomationController[];
-CONTENT_EXPORT extern const char kStatsCollectionController[];
 CONTENT_EXPORT extern const char kEnableAcceleratedFilters[];
+CONTENT_EXPORT extern const char kEnableAcceleratedFixedRootBackground[];
+extern const char kEnableAcceleratedOverflowScroll[];
+extern const char kEnableAcceleratedScrollableFrames[];
 extern const char kEnableAccessibilityLogging[];
 extern const char kEnableAudibleNotifications[];
-CONTENT_EXPORT extern const char kDisableBrowserPluginCompositing[];
+CONTENT_EXPORT extern const char kEnableBeginFrameScheduling[];
+CONTENT_EXPORT extern const char kEnableBrowserInputController[];
 CONTENT_EXPORT extern const char kEnableBrowserPluginForAllViewTypes[];
 CONTENT_EXPORT extern const char kEnableBrowserPluginDragDrop[];
+extern const char kEnableCompositedScrollingForFrames[];
 CONTENT_EXPORT extern const char kEnableCompositingForFixedPosition[];
-CONTENT_EXPORT extern const char kEnableHighDpiCompositingForFixedPosition[];
-CONTENT_EXPORT extern const char kDisableCompositingForFixedPosition[];
 CONTENT_EXPORT extern const char kEnableCompositingForTransition[];
-CONTENT_EXPORT extern const char kDisableCompositingForTransition[];
 CONTENT_EXPORT extern const char kEnableCssShaders[];
-CONTENT_EXPORT extern const char kDisableDelegatedRenderer[];
+CONTENT_EXPORT extern const char kEnableDeferredImageDecoding[];
 CONTENT_EXPORT extern const char kEnableDelegatedRenderer[];
 CONTENT_EXPORT extern const char kEnableDeviceMotion[];
-#if defined(OS_ANDROID)
-CONTENT_EXPORT extern const char kDisableDeviceMotion[];
-#endif
 CONTENT_EXPORT extern const char kEnableDownloadResumption[];
+extern const char kEnableEncryptedMedia[];
+CONTENT_EXPORT extern const char kEnableExperimentalCanvasFeatures[];
 CONTENT_EXPORT extern const char kEnableExperimentalWebPlatformFeatures[];
-CONTENT_EXPORT extern const char kEnableRegionBasedColumns[];
-CONTENT_EXPORT extern const char kDisableThreadedHTMLParser[];
+extern const char kEnableExperimentalWebSocket[];
 CONTENT_EXPORT extern const char kEnableFixedLayout[];
-CONTENT_EXPORT extern const char kDisableFullScreen[];
-CONTENT_EXPORT extern const char kEnableTextServicesFramework[];
+CONTENT_EXPORT extern const char kEnableFixedPositionCreatesStackingContext[];
 CONTENT_EXPORT extern const char kEnableGestureTapHighlight[];
-CONTENT_EXPORT extern const char kDisableGestureTapHighlight[];
 extern const char kEnableGpuBenchmarking[];
 extern const char kEnableGpuClientTracing[];
+CONTENT_EXPORT extern const char kEnableHighDpiCompositingForFixedPosition[];
+extern const char kEnableHTMLImports[];
 CONTENT_EXPORT extern const char kEnableInbandTextTracks[];
-extern const char kEnableMemoryBenchmarking[];
-extern const char kEnableSkiaBenchmarking[];
 CONTENT_EXPORT extern const char kEnableLogging[];
-extern const char kDisableWebKitMediaSource[];
-extern const char kEnableEncryptedMedia[];
-extern const char kDisableLegacyEncryptedMedia[];
-CONTENT_EXPORT extern const char kUseFakeDeviceForMediaStream[];
-CONTENT_EXPORT extern const char kUseFakeUIForMediaStream[];
+extern const char kEnableMemoryBenchmarking[];
 extern const char kEnableMonitorProfile[];
 extern const char kEnableNewMediaInternals[];
-extern const char kEnableUserMediaScreenCapturing[];
-extern const char kEnablePinch[];
 CONTENT_EXPORT extern const char kEnableOfflineCacheAccess[];
-extern const char kDisablePinch[];
+CONTENT_EXPORT extern const char kEnableOverscrollNotifications[];
+extern const char kEnablePinch[];
 extern const char kEnablePreparsedJsCaching[];
 CONTENT_EXPORT extern const char kEnablePrivilegedWebGLExtensions[];
 extern const char kEnablePruneGpuCommandBuffers[];
-extern const char kEnableSSLCachedInfo[];
+CONTENT_EXPORT extern const char kEnableRegionBasedColumns[];
 extern const char kEnableSandboxLogging[];
-extern const char kEnableSpatialNavigation[];
-CONTENT_EXPORT extern const char kEnableSoftwareCompositing[];
+extern const char kEnableSkiaBenchmarking[];
 CONTENT_EXPORT extern const char kEnableSmoothScrolling[];
+CONTENT_EXPORT extern const char kEnableSoftwareCompositing[];
+extern const char kEnableSpatialNavigation[];
+CONTENT_EXPORT extern const char kEnableSpeechSynthesis[];
+extern const char kEnableSSLCachedInfo[];
 CONTENT_EXPORT extern const char kEnableStatsTable[];
 extern const char kEnableStrictSiteIsolation[];
-CONTENT_EXPORT extern const char kEnableThreadedCompositing[];
-CONTENT_EXPORT extern const char kDisableThreadedCompositing[];
-extern const char kEnableVirtualGLContexts[];
 CONTENT_EXPORT extern const char kEnableTcpFastOpen[];
-CONTENT_EXPORT extern const char kDisableAcceleratedVideoDecode[];
+CONTENT_EXPORT extern const char kEnableTextServicesFramework[];
+CONTENT_EXPORT extern const char kEnableThreadedCompositing[];
+extern const char kEnableUserMediaScreenCapturing[];
 extern const char kEnableViewport[];
+extern const char kEnableVirtualGLContexts[];
+extern const char kEnableVisualWordMovement[];
+CONTENT_EXPORT extern const char kEnableVtune[];
+extern const char kEnableWebAnimationsCSS[];
+extern const char kEnableWebAnimationsSVG[];
+CONTENT_EXPORT extern const char kEnableWebGLDraftExtensions[];
+extern const char kEnableWebMIDI[];
+extern const char kEnableWebRtcTcpServerSocket[];
 CONTENT_EXPORT extern const char kExperimentalLocationFeatures[];
+CONTENT_EXPORT extern const char kExtraPluginDir[];
 CONTENT_EXPORT extern const char kForceCompositingMode[];
 extern const char kForceFieldTrials[];
 CONTENT_EXPORT extern const char kForceRendererAccessibility[];
@@ -166,30 +171,29 @@
 extern const char kGpuSandboxAllowSysVShm[];
 extern const char kGpuStartupDialog[];
 extern const char kGpuVendorID[];
-#if defined(OS_ANDROID)
-CONTENT_EXPORT extern const char kHideScrollbars[];
-#endif
 CONTENT_EXPORT extern const char kHostResolverRules[];
 CONTENT_EXPORT extern const char kIgnoreCertificateErrors[];
 CONTENT_EXPORT extern const char kIgnoreGpuBlacklist[];
 extern const char kInProcessGPU[];
 extern const char kInProcessPlugins[];
 CONTENT_EXPORT extern const char kJavaScriptFlags[];
-CONTENT_EXPORT extern const char kExtraPluginDir[];
 extern const char kLoadPlugin[];
-CONTENT_EXPORT extern const char kDisablePluginsDiscovery[];
 CONTENT_EXPORT extern const char kLoggingLevel[];
+CONTENT_EXPORT extern const char kLogNetLog[];
 extern const char kLogPluginMessages[];
+extern const char kMaxUntiledLayerHeight[];
+extern const char kMaxUntiledLayerWidth[];
 extern const char kMemoryMetrics[];
 CONTENT_EXPORT extern const char kMuteAudio[];
 CONTENT_EXPORT extern const char kNoReferrers[];
 CONTENT_EXPORT extern const char kNoSandbox[];
-CONTENT_EXPORT extern const char kAllowNoSandboxJob[];
+CONTENT_EXPORT extern const char kOverscrollHistoryNavigation[];
 extern const char kPluginLauncher[];
 CONTENT_EXPORT extern const char kPluginPath[];
 CONTENT_EXPORT extern const char kPluginProcess[];
 extern const char kPluginStartupDialog[];
 CONTENT_EXPORT extern const char kPpapiBrokerProcess[];
+extern const char kPpapiFlashArgs[];
 CONTENT_EXPORT extern const char kPpapiInProcess[];
 extern const char kPpapiPluginLauncher[];
 CONTENT_EXPORT extern const char kPpapiPluginProcess[];
@@ -197,36 +201,36 @@
 CONTENT_EXPORT extern const char kProcessPerSite[];
 CONTENT_EXPORT extern const char kProcessPerTab[];
 CONTENT_EXPORT extern const char kProcessType[];
+extern const char kReduceGpuSandbox[];
 CONTENT_EXPORT extern const char kRegisterPepperPlugins[];
 CONTENT_EXPORT extern const char kRemoteDebuggingPort[];
-#if defined(OS_ANDROID)
-CONTENT_EXPORT extern const char kRemoteDebuggingSocketName[];
-#endif
 CONTENT_EXPORT extern const char kRendererAssertTest[];
 extern const char kRendererCmdPrefix[];
 CONTENT_EXPORT extern const char kRendererProcess[];
-CONTENT_EXPORT extern const char kEnableVtune[];
 extern const char kRendererProcessLimit[];
 extern const char kRendererStartupDialog[];
-extern const char kEnableAcceleratedOverflowScroll[];
-extern const char kDisableAcceleratedOverflowScroll[];
-extern const char kEnableAcceleratedScrollableFrames[];
-extern const char kEnableCompositedScrollingForFrames[];
+CONTENT_EXPORT extern const char kScrollEndEffect[];
 extern const char kShowPaintRects[];
 CONTENT_EXPORT extern const char kSimulateTouchScreenWithMouse[];
 CONTENT_EXPORT extern const char kSingleProcess[];
 CONTENT_EXPORT extern const char kSitePerProcess[];
 CONTENT_EXPORT extern const char kSkipGpuDataLoading[];
-extern const char kTabCaptureUpscaleQuality[];
+extern const char kSpeechRecognitionWebserviceKey[];
+CONTENT_EXPORT extern const char kStatsCollectionController[];
 extern const char kTabCaptureDownscaleQuality[];
+extern const char kTabCaptureUpscaleQuality[];
 extern const char kTapDownDeferralTimeMs[];
-CONTENT_EXPORT extern const char kTestSandbox[];
 CONTENT_EXPORT extern const char kTestingFixedHttpPort[];
 CONTENT_EXPORT extern const char kTestingFixedHttpsPort[];
+CONTENT_EXPORT extern const char kTestSandbox[];
 extern const char kTraceStartup[];
-extern const char kTraceStartupFile[];
 extern const char kTraceStartupDuration[];
+extern const char kTraceStartupFile[];
 CONTENT_EXPORT extern const char kUIPrioritizeInGpuProcess[];
+CONTENT_EXPORT extern const char kUseFakeDeviceForMediaStream[];
+CONTENT_EXPORT extern const char kUseFakeUIForMediaStream[];
+CONTENT_EXPORT extern const char kUseGpuInTests[];
+CONTENT_EXPORT extern const char kUseMobileUserAgent[];
 CONTENT_EXPORT extern const char kUserAgent[];
 extern const char kUtilityCmdPrefix[];
 CONTENT_EXPORT extern const char kUtilityProcess[];
@@ -237,52 +241,46 @@
 CONTENT_EXPORT extern const char kWorkerProcess[];
 CONTENT_EXPORT extern const char kZygoteCmdPrefix[];
 CONTENT_EXPORT extern const char kZygoteProcess[];
-CONTENT_EXPORT extern const char kDisableSoftwareRasterizer[];
-extern const char kDefaultTileWidth[];
-extern const char kDefaultTileHeight[];
-extern const char kMaxUntiledLayerWidth[];
-extern const char kMaxUntiledLayerHeight[];
-CONTENT_EXPORT extern const char kEnableFixedPositionCreatesStackingContext[];
-CONTENT_EXPORT extern const char kDisableFixedPositionCreatesStackingContext[];
-CONTENT_EXPORT extern const char kEnableDeferredImageDecoding[];
-CONTENT_EXPORT extern const char kEnableBeginFrameScheduling[];
-CONTENT_EXPORT extern const char kEnableBrowserInputController[];
 
-extern const char kEnableVisualWordMovement[];
-CONTENT_EXPORT extern const char kUseMobileUserAgent[];
+#if defined(ENABLE_WEBRTC)
+CONTENT_EXPORT extern const char kDisableDeviceEnumeration[];
+CONTENT_EXPORT extern const char kEnableSCTPDataChannels[];
+extern const char kEnableWebRtcAecRecordings[];
+extern const char kEnableWebRtcHWDecoding[];
+#endif
 
 #if defined(OS_ANDROID)
-extern const char kDisableMediaHistoryLogging[];
+CONTENT_EXPORT extern const char kDisableDeviceMotion[];
 CONTENT_EXPORT extern const char kDisableGestureRequirementForMediaPlayback[];
-extern const char kNetworkCountryIso[];
+extern const char kDisableMediaHistoryLogging[];
 CONTENT_EXPORT extern const char kDisableOverscrollEdgeEffect[];
+CONTENT_EXPORT extern const char kDisableWebRTC[];
+CONTENT_EXPORT extern const char kEnableSpeechRecognition[];
+CONTENT_EXPORT extern const char kHideScrollbars[];
+extern const char kNetworkCountryIso[];
+CONTENT_EXPORT extern const char kRemoteDebuggingSocketName[];
 #endif
 
 #if defined(OS_CHROMEOS)
 CONTENT_EXPORT extern const char kDisablePanelFitting[];
 #endif
 
-#if defined(OS_POSIX)
-extern const char kChildCleanExit[];
-#endif
-
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 extern const char kDisableCarbonInterposing[];
 extern const char kUseCoreAnimation[];
 #endif
 
+#if defined(OS_POSIX)
+extern const char kChildCleanExit[];
+#endif
+
 #if defined(USE_AURA)
 CONTENT_EXPORT extern const char kTestCompositor[];
 #endif
 
-CONTENT_EXPORT extern const char kOverscrollHistoryNavigation[];
-CONTENT_EXPORT extern const char kScrollEndEffect[];
-CONTENT_EXPORT extern const char kEnableOverscrollNotifications[];
-CONTENT_EXPORT extern const char kEnableWebGLDraftExtensions[];
+// 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).
 
-CONTENT_EXPORT extern const char kDisableAcceleratedFixedRootBackground[];
-CONTENT_EXPORT extern const char kEnableAcceleratedFixedRootBackground[];
-
 }  // namespace switches
 
 #endif  // CONTENT_PUBLIC_COMMON_CONTENT_SWITCHES_H_