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

4 files changed, 6 insertions, 13 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";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index a944d8d..74bec36 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -47,7 +47,6 @@ extern const char kCloudPrintServiceURL[];
 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 kDisableApps[];
@@ -63,7 +62,6 @@ extern const char kDisableDatabases[];
 extern const char kDisableDesktopNotifications[];
 extern const char kDisableDevTools[];
 extern const char kDisableDeviceOrientation[];
-extern const char kDisableExperimentalWebGL[];
 extern const char kDisableExtensions[];
 extern const char kDisableExtensionsFileAccessCheck[];
 extern const char kDisableGeolocation[];
@@ -125,6 +123,7 @@ extern const char kEnableCookiePrompt[];
 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[];
diff --git a/chrome/common/sandbox_init_wrapper_mac.cc b/chrome/common/sandbox_init_wrapper_mac.cc
index ca21255..d3017b7 100644
--- a/chrome/common/sandbox_init_wrapper_mac.cc
+++ b/chrome/common/sandbox_init_wrapper_mac.cc
@@ -22,7 +22,7 @@ bool SandboxInitWrapper::InitializeSandbox(const CommandLine& command_line,
     // Browser process isn't sandboxed.
     return true;
   } else if (process_type == switches::kRendererProcess) {
-    if (!command_line.HasSwitch(switches::kDisableExperimentalWebGL) &&
+    if (command_line.HasSwitch(switches::kEnableExperimentalWebGL) &&
         command_line.HasSwitch(switches::kInProcessWebGL)) {
       // TODO(kbr): this check seems to be necessary only on this
       // platform because the sandbox is initialized later. Remove
diff --git a/chrome/common/sandbox_policy.cc b/chrome/common/sandbox_policy.cc
index dd9996c..e772fc9 100644
--- a/chrome/common/sandbox_policy.cc
+++ b/chrome/common/sandbox_policy.cc
@@ -460,7 +460,7 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line,
     in_sandbox = false;
   }
 #endif
-  if (!browser_command_line.HasSwitch(switches::kDisableExperimentalWebGL) &&
+  if (browser_command_line.HasSwitch(switches::kEnableExperimentalWebGL) &&
       browser_command_line.HasSwitch(switches::kInProcessWebGL)) {
     // In process WebGL won't work if the sandbox is enabled.
     in_sandbox = false;