Abstract OSMesa from the Layout tests

ui/gl/init/gl_factory.h

 // 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.
 
 #ifndef UI_GL_INIT_GL_FACTORY_H_
 #define UI_GL_INIT_GL_FACTORY_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
@@ skipping 15 matching lines @@
 
 // Returns a list of allowed GL implementations. The default implementation will
 // be the first item.
 GL_INIT_EXPORT std::vector<GLImplementation> GetAllowedGLImplementations();
 
 // Initializes GL bindings.
 GL_INIT_EXPORT bool InitializeGLOneOff();
 
 // Initializes GL bindings using the provided parameters. This might be required
 // for use in tests, otherwise use InitializeGLOneOff() instead.
-GL_INIT_EXPORT bool InitializeGLOneOffImplementation(GLImplementation impl,
-                                                     bool fallback_to_osmesa,
-                                                     bool gpu_service_logging,
-                                                     bool disable_gl_drawing);
+GL_INIT_EXPORT bool InitializeGLOneOffImplementation(
+    GLImplementation impl,
+    bool fallback_to_software_gl,
+    bool gpu_service_logging,
+    bool disable_gl_drawing);
 
 // Clears GL bindings and resets GL implementation.
 GL_INIT_EXPORT void ShutdownGL();
 
 // Return information about the GL window system binding implementation (e.g.,
 // EGL, GLX, WGL). Returns true if the information was retrieved successfully.
 GL_INIT_EXPORT bool GetGLWindowSystemBindingInfo(
     GLWindowSystemBindingInfo* info);
 
 // Creates a GL context that is compatible with the given surface.
@@ skipping 21 matching lines @@
 GL_INIT_EXPORT scoped_refptr<GLSurface> CreateOffscreenGLSurface(
     const gfx::Size& size);
 
 GL_INIT_EXPORT scoped_refptr<GLSurface> CreateOffscreenGLSurfaceWithFormat(
     const gfx::Size& size, GLSurfaceFormat format);
 
 }  // namespace init
 }  // namespace gl
 
 #endif  // UI_GL_INIT_GL_FACTORY_H_