Re-land: ui: Add GLImage unit test framework.

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 "base/command_line.h"
 #include "base/logging.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
@@ skipping 43 matching lines @@
 
   bool fallback_to_osmesa = false;
   bool gpu_service_logging = false;
   bool disable_gl_drawing = true;
 
   CHECK(GLSurface::InitializeOneOffImplementation(
       impl, fallback_to_osmesa, gpu_service_logging, disable_gl_drawing));
 }
 
 // static
+void GLSurfaceTestSupport::InitializeOneOffImplementation(
+    GLImplementation impl,
+    bool fallback_to_osmesa) {
+  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.
+  ClearGLBindings();
+
+  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() {
-  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
-  // mock bindings in different ways.
-  ClearGLBindings();
-
-  bool fallback_to_osmesa = false;
-  bool gpu_service_logging = false;
-  bool disable_gl_drawing = false;
-
-  CHECK(GLSurface::InitializeOneOffImplementation(
-      kGLImplementationMockGL, fallback_to_osmesa, gpu_service_logging,
-      disable_gl_drawing));
+  InitializeOneOffImplementation(kGLImplementationMockGL, false);
 }
 
 // static
 void GLSurfaceTestSupport::InitializeDynamicMockBindings(GLContext* context) {
   CHECK(InitializeDynamicGLBindings(kGLImplementationMockGL, context));
 }
 
 }  // namespace gfx