| Index: ui/gl/test/gl_surface_test_support.cc
|
| diff --git a/ui/gl/test/gl_surface_test_support.cc b/ui/gl/test/gl_surface_test_support.cc
|
| index 99ae71879e3d52f27f0ad039f8c6680360fcc59e..ecc8015c5ef3fd320c17e4b591c9f9f2f94d3514 100644
|
| --- a/ui/gl/test/gl_surface_test_support.cc
|
| +++ b/ui/gl/test/gl_surface_test_support.cc
|
| @@ -61,26 +61,21 @@
|
| }
|
|
|
| // static
|
| -void GLSurfaceTestSupport::InitializeOneOffImplementation(
|
| - GLImplementation impl,
|
| - bool fallback_to_osmesa) {
|
| +void GLSurfaceTestSupport::InitializeOneOffWithMockBindings() {
|
| 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.
|
| + // mock bindings in different ways.
|
| ClearGLBindings();
|
|
|
| + bool fallback_to_osmesa = false;
|
| bool gpu_service_logging = false;
|
| bool disable_gl_drawing = false;
|
|
|
| CHECK(GLSurface::InitializeOneOffImplementation(
|
| - impl, fallback_to_osmesa, gpu_service_logging, disable_gl_drawing));
|
| -}
|
| -
|
| -// static
|
| -void GLSurfaceTestSupport::InitializeOneOffWithMockBindings() {
|
| - InitializeOneOffImplementation(kGLImplementationMockGL, false);
|
| + kGLImplementationMockGL, fallback_to_osmesa, gpu_service_logging,
|
| + disable_gl_drawing));
|
| }
|
|
|
| // static
|
|
|