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

content/shell/shell_main_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/shell_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 88 matching lines @@
   // WebKitTestPlatformInitialize() are called.
   OverrideFrameworkBundlePath();
   OverrideChildProcessPath();
 #endif  // OS_MACOSX
 
   InitLogging();
   CommandLine& command_line = *CommandLine::ForCurrentProcess();
   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()) {
       if (exit_code)
         *exit_code = 1;
       return true;
     }
   }
   SetContentClient(&content_client_);
   return false;
@@ skipping 60 matching lines @@
   browser_client_.reset(new ShellContentBrowserClient);
   return browser_client_.get();
 }
 
 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
   renderer_client_.reset(new ShellContentRendererClient);
   return renderer_client_.get();
 }
 
 }  // namespace content