Abstract OSMesa from the Layout tests

ui/gl/test/gl_surface_test_support.cc

 // Copyright 2015 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 "ui/gl/test/gl_surface_test_support.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 16 matching lines @@
 
 // static
 void GLSurfaceTestSupport::InitializeOneOff() {
   DCHECK_EQ(kGLImplementationNone, GetGLImplementation());
 
 #if defined(USE_X11)
   XInitThreads();
 #endif
   ui::test::EnableTestConfigForPlatformWindows();
 
-  bool use_osmesa = true;
+  bool use_software_renderer = true;

[Ken Russell (switch to Gerrit), 2017/02/15 02:32:15]

Similar here.

 
-  // We usually use OSMesa as this works on all bots. The command line can
-  // override this behaviour to use hardware GL.
+  // We usually use a software renderer as this works on all bots. The
+  // command line can override this behaviour to use hardware GL.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kUseGpuInTests)) {
-    use_osmesa = false;
+    use_software_renderer = false;
   }
 
 #if defined(OS_ANDROID)
   // On Android we always use hardware GL.
-  use_osmesa = false;
+  use_software_renderer = false;
 #endif
 
   std::vector<GLImplementation> allowed_impls =
       init::GetAllowedGLImplementations();
   DCHECK(!allowed_impls.empty());
 
   GLImplementation impl = allowed_impls[0];
-  if (use_osmesa)
-    impl = kGLImplementationOSMesaGL;
+  if (use_software_renderer)
+    impl = gl::GetSoftwareGLImplementation();
 
   DCHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseGL))
       << "kUseGL has not effect in tests";
 
-  bool fallback_to_osmesa = false;
+  bool fallback_to_software_rendering = false;
   bool gpu_service_logging = false;
   bool disable_gl_drawing = true;
 
   CHECK(init::InitializeGLOneOffImplementation(
-      impl, fallback_to_osmesa, gpu_service_logging, disable_gl_drawing));
+      impl, fallback_to_software_rendering, gpu_service_logging,
+      disable_gl_drawing));
 }
 
 // static
 void GLSurfaceTestSupport::InitializeOneOffImplementation(
     GLImplementation impl,
-    bool fallback_to_osmesa) {
+    bool fallback_to_software_rendering) {
   DCHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseGL))
       << "kUseGL has not effect in tests";
 
   // This method may be called multiple times in the same process to set up
   // bindings in different ways.
   init::ShutdownGL();
 
   bool gpu_service_logging = false;
   bool disable_gl_drawing = false;
 
   CHECK(init::InitializeGLOneOffImplementation(
-      impl, fallback_to_osmesa, gpu_service_logging, disable_gl_drawing));
+      impl, fallback_to_software_rendering, gpu_service_logging,
+      disable_gl_drawing));
 }
 
 // static
 void GLSurfaceTestSupport::InitializeOneOffWithMockBindings() {
 #if defined(USE_OZONE)
   // This function skips where Ozone is otherwise initialized.
   ui::OzonePlatform::InitializeForGPU();
 #endif
   InitializeOneOffImplementation(kGLImplementationMockGL, false);
 }
 
 void GLSurfaceTestSupport::InitializeOneOffWithStubBindings() {
 #if defined(USE_OZONE)
   // This function skips where Ozone is otherwise initialized.
   ui::OzonePlatform::InitializeForGPU();
 #endif
   InitializeOneOffImplementation(kGLImplementationStubGL, false);
 }
 
 }  // namespace gl