Remove enable-software-compositing command-line flag.

content/shell/browser/webkit_test_controller.cc

 // Copyright 2013 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/browser/webkit_test_controller.h"
 
 #include <iostream>
 
 #include "base/base64.h"
 #include "base/command_line.h"
@@ skipping 309 matching lines @@
   printer_->AddErrorMessage("#CRASHED - worker");
   DiscardMainWindow();
 }
 
 void WebKitTestController::OverrideWebkitPrefs(WebPreferences* prefs) {
   if (should_override_prefs_) {
     *prefs = prefs_;
   } else {
     ApplyLayoutTestDefaultPreferences(prefs);
     if (is_compositing_test_) {
-      CommandLine& command_line = *CommandLine::ForCurrentProcess();
-      if (!command_line.HasSwitch(switches::kEnableSoftwareCompositing))
-        prefs->accelerated_2d_canvas_enabled = true;

[piman, 2014/04/11 20:30:46]

I'm not sure that's right... this is used for layout tests, which have a
different set of flags that's set by default. It sounds like this would disable
accelerated canvas layout tests altogether?

IIRC that's where the virtual/softwarecompositing "virtual" test suite comes in.
See third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py

Maybe this can be keyed off --disable-gpu instead (which seems to be set as well
in that virtual test suite)?

       prefs->accelerated_compositing_for_video_enabled = true;
       prefs->mock_scrollbars_enabled = true;
     }
   }
 }
 
 void WebKitTestController::OpenURL(const GURL& url) {
   if (test_phase_ != DURING_TEST)
     return;
 
@@ skipping 328 matching lines @@
     return;
   }
 
   printer_->AddErrorMessage(
       base::StringPrintf("#LEAK - renderer pid %d (%s)", current_pid_,
                          result.detail.c_str()));
   DiscardMainWindow();
 }
 
 }  // namespace content