Remove --ui-enable-software-compositing flag.

content/public/test/browser_test_base.cc

 // Copyright (c) 2011 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/public/test/browser_test_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 138 matching lines @@
   command_line->AppendSwitch(switches::kDomAutomationController);
 
   // It is sometimes useful when looking at browser test failures to know which
   // GPU blacklisting decisions were made.
   command_line->AppendSwitch(switches::kLogGpuControlListDecisions);
 
   if (use_software_compositing_) {
     command_line->AppendSwitch(switches::kDisableGpu);
     command_line->AppendSwitch(switches::kEnableSoftwareCompositing);
 #if defined(USE_AURA)
-    command_line->AppendSwitch(switches::kUIEnableSoftwareCompositing);
     command_line->AppendSwitch(switches::kUIDisableThreadedCompositing);
 #endif
   }
 
 #if defined(USE_AURA)
   // Most tests do not need pixel output, so we don't produce any. The command
   // line can override this behaviour to allow for visual debugging.
   if (command_line->HasSwitch(switches::kEnablePixelOutputInTests))
     enable_pixel_output_ = true;
 
@@ skipping 122 matching lines @@
   use_software_compositing_ = true;
 }
 
 bool BrowserTestBase::UsingOSMesa() const {
   CommandLine* cmd = CommandLine::ForCurrentProcess();
   return cmd->GetSwitchValueASCII(switches::kUseGL) ==
          gfx::kGLImplementationOSMesaName;
 }
 
 }  // namespace content