Back out r58711. It appears to have caused video/media-related ui_tests

failures on Windows:

MediaTest.VideoBearTheora
MediaTest.VideoBearSilentTheora
MediaTest.VideoBearWebm
MediaTest.VideoBearSilentWebm
UILayoutTest.MediaUILayoutTest

BUG=54469
TEST=tree
Review URL: http://codereview.chromium.org/3333019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58730 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 9 deletions

diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 117de59..d231c33 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -117,10 +117,6 @@ const char kDebugPrint[]                    = "debug-print";
 // Triggers a pletora of diagnostic modes.
 const char kDiagnostics[]                   = "diagnostics";
 
-// Disables accelerated compositing.
-const char kDisableAcceleratedCompositing[]  =
-    "disable-accelerated-compositing";
-
 // Disables the alternate window station for the renderer.
 const char kDisableAltWinstation[]          = "disable-winsta";
 
@@ -178,9 +174,6 @@ const char kDisableDevTools[]               = "disable-dev-tools";
 // Disables device orientation events.
 const char kDisableDeviceOrientation[]      = "disable-device-orientation";
 
-// Disable experimental WebGL support.
-const char kDisableExperimentalWebGL[]       = "disable-webgl";
-
 // Disable extensions.
 const char kDisableExtensions[]             = "disable-extensions";
 
@@ -346,8 +339,6 @@ const char kDumpHistogramsOnExit[]          = "dump-histograms-on-exit";
 extern const char kLogNetLog[]              = "log-net-log";
 
 // Enable gpu-accelerated compositing.
-// TODO(vangelis): Remove the flag once accelerated compositing is enabled by
-// default on all platforms.
 const char kEnableAcceleratedCompositing[]  = "enable-accelerated-compositing";
 
 // Enable gpu-accelerated 2d canvas.
@@ -400,6 +391,9 @@ const char kEnableDNSSECCerts[]             = "enable-dnssec-certs";
 const char kEnableExperimentalExtensionApis[] =
     "enable-experimental-extension-apis";
 
+// Enable experimental WebGL support.
+const char kEnableExperimentalWebGL[]       = "enable-webgl";
+
 // Enable experimental timeline API.
 const char kEnableExtensionTimelineApi[]    = "enable-extension-timeline-api";