[CLOSED] Cleaning up the plethora of switches for GPU vs software vs SwiftShader.

content/shell/shell_main_delegate.cc

Index: content/shell/shell_main_delegate.cc
diff --git a/content/shell/shell_main_delegate.cc b/content/shell/shell_main_delegate.cc
index 9689c0da52d3264669f122ca7117fd3f4122c104..a4fba4e79bc9df6d7fd6dab868e4c5a66bb34dde 100644
--- a/content/shell/shell_main_delegate.cc
+++ b/content/shell/shell_main_delegate.cc
@@ -106,16 +106,18 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
   if (command_line.HasSwitch(switches::kDumpRenderTree)) {
     command_line.AppendSwitch(switches::kProcessPerTab);
     command_line.AppendSwitch(switches::kAllowFileAccessFromFiles);
-    command_line.AppendSwitchASCII(
-        switches::kUseGL, gfx::kGLImplementationOSMesaName);
-    SetAllowOSMesaImageTransportForTesting();
     command_line.AppendSwitch(switches::kSkipGpuDataLoading);
     command_line.AppendSwitch(switches::kEnableExperimentalWebKitFeatures);
-    command_line.AppendSwitch(switches::kEnableCssShaders);
     command_line.AppendSwitchASCII(switches::kTouchEvents,
                                    switches::kTouchEventsEnabled);
-    if (command_line.HasSwitch(switches::kEnableSoftwareCompositing))
-      command_line.AppendSwitch(switches::kEnableSoftwareCompositingGLAdapter);
+    if (command_line.HasSwitch(switches::kEnableSoftwareCompositing)) {
+      command_line.AppendSwitch(switches::kDisableGpu);
+    } else {
+      SetAllowOSMesaImageTransportForTesting();
+      command_line.AppendSwitchASCII(
+          switches::kUseGL, gfx::kGLImplementationOSMesaName);
+      command_line.AppendSwitch(switches::kEnableCssShaders);
+    }
 
     net::CookieMonster::EnableFileScheme();
     if (!WebKitTestPlatformInitialize()) {