Move GL one-off initialization code.

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"
 #include "build/build_config.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
-#include "ui/gl/gl_surface.h"
 #include "ui/gl/gl_switches.h"
+#include "ui/gl/init/gl_factory.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #include "ui/platform_window/x11/x11_window.h"
 #endif
 
 namespace gl {
 
 // static
 void GLSurfaceTestSupport::InitializeOneOff() {
@@ skipping 26 matching lines @@
   if (use_osmesa)
     impl = kGLImplementationOSMesaGL;
 
   DCHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseGL))
       << "kUseGL has not effect in tests";
 
   bool fallback_to_osmesa = false;
   bool gpu_service_logging = false;
   bool disable_gl_drawing = true;
 
-  CHECK(GLSurface::InitializeOneOffImplementation(
+  CHECK(init::InitializeGLOneOffImplementation(
       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(
+  CHECK(init::InitializeGLOneOffImplementation(
       impl, fallback_to_osmesa, gpu_service_logging, disable_gl_drawing));
 }
 
 // static
 void GLSurfaceTestSupport::InitializeOneOffWithMockBindings() {
   InitializeOneOffImplementation(kGLImplementationMockGL, false);
 }
 
 // static
 void GLSurfaceTestSupport::InitializeDynamicMockBindings(GLContext* context) {
   CHECK(InitializeDynamicGLBindings(kGLImplementationMockGL, context));
 }
 
 }  // namespace gl