Remove enable-software-compositing command-line flag.

content/shell/browser/webkit_test_controller.cc

Index: content/shell/browser/webkit_test_controller.cc
diff --git a/content/shell/browser/webkit_test_controller.cc b/content/shell/browser/webkit_test_controller.cc
index fe53946a3ac79454c6d8edbce6e16f9d9ceaaecf..f63330b295e5276b8c35a628eb686705feffc067 100644
--- a/content/shell/browser/webkit_test_controller.cc
+++ b/content/shell/browser/webkit_test_controller.cc
@@ -328,7 +328,7 @@ void WebKitTestController::OverrideWebkitPrefs(WebPreferences* prefs) {
     ApplyLayoutTestDefaultPreferences(prefs);
     if (is_compositing_test_) {
       CommandLine& command_line = *CommandLine::ForCurrentProcess();
-      if (!command_line.HasSwitch(switches::kEnableSoftwareCompositing))
+      if (!command_line.HasSwitch(switches::kDisableGpu))
         prefs->accelerated_2d_canvas_enabled = true;
       prefs->accelerated_compositing_for_video_enabled = true;
       prefs->mock_scrollbars_enabled = true;