Merge 63535 - Disable GPU features AcceleratingCompositing and WebGL by defau...

chrome/common/chrome_switches.h

Index: chrome/common/chrome_switches.h
===================================================================
--- chrome/common/chrome_switches.h	(revision 63542)
+++ chrome/common/chrome_switches.h	(working copy)
@@ -48,7 +48,6 @@
 extern const char kCountry[];
 extern const char kDebugPrint[];
 extern const char kDiagnostics[];
-extern const char kDisableAcceleratedCompositing[];
 extern const char kDisableAltWinstation[];
 extern const char kDisableApplicationCache[];
 extern const char kDisableAudio[];
@@ -64,7 +63,6 @@
 extern const char kDisableDesktopNotifications[];
 extern const char kDisableDevTools[];
 extern const char kDisableDeviceOrientation[];
-extern const char kDisableExperimentalWebGL[];
 extern const char kDisableExtensionsFileAccessCheck[];
 extern const char kDisableExtensions[];
 extern const char kDisableFileSystem[];
@@ -115,6 +113,7 @@
 extern const char kDomAutomationController[];
 extern const char kDumpHistogramsOnExit[];
 extern const char kEnableAccelerated2dCanvas[];
+extern const char kEnableAcceleratedCompositing[];
 extern const char kEnableAccessibility[];
 extern const char kEnableAeroPeekTabs[];
 extern const char kEnableAppLauncher[];
@@ -130,6 +129,7 @@
 extern const char kEnableDeviceMotion[];
 extern const char kEnableDNSSECCerts[];
 extern const char kEnableExperimentalExtensionApis[];
+extern const char kEnableExperimentalWebGL[];
 extern const char kEnableExtensionTimelineApi[];
 extern const char kEnableFastback[];
 extern const char kEnableFileCookies[];