Abstract OSMesa from the Layout tests

services/ui/ws/window_server_service_test_base.cc

Index: services/ui/ws/window_server_service_test_base.cc
diff --git a/services/ui/ws/window_server_service_test_base.cc b/services/ui/ws/window_server_service_test_base.cc
index 12203e4b7ca21262acdf3930400a114ad1f2be73..4289dca2f44498bd751095ff9658abbe09d7d21e 100644
--- a/services/ui/ws/window_server_service_test_base.cc
+++ b/services/ui/ws/window_server_service_test_base.cc
@@ -50,7 +50,7 @@ void EnsureCommandLineSwitch(const std::string& name) {
 WindowServerServiceTestBase::WindowServerServiceTestBase()
     : ServiceTest(kTestAppName) {
   EnsureCommandLineSwitch(switches::kUseTestConfig);
-  EnsureCommandLineSwitch(::switches::kOverrideUseGLWithOSMesaForTests);
+  EnsureCommandLineSwitch(::switches::kOverrideUseSoftwareGLForTests);
 }
 
 WindowServerServiceTestBase::~WindowServerServiceTestBase() {}