Abstract OSMesa from the Layout tests

services/ui/ws/window_server_service_test_base.cc

 // Copyright 2016 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 "services/ui/ws/window_server_service_test_base.h"
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 32 matching lines @@
   base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (!cmd_line->HasSwitch(name))
     cmd_line->AppendSwitch(name);
 }
 
 }  // namespace
 
 WindowServerServiceTestBase::WindowServerServiceTestBase()
     : ServiceTest(kTestAppName) {
   EnsureCommandLineSwitch(switches::kUseTestConfig);
-  EnsureCommandLineSwitch(::switches::kOverrideUseGLWithOSMesaForTests);
+  EnsureCommandLineSwitch(::switches::kOverrideUseSoftwareGLForTests);
 }
 
 WindowServerServiceTestBase::~WindowServerServiceTestBase() {}
 
 std::unique_ptr<service_manager::Service>
 WindowServerServiceTestBase::CreateService() {
   return base::MakeUnique<WindowServerServiceTestClient>(this);
 }
 
 }  // namespace ui