Move static GL binding initialization to //ui/gl/init.

ui/gl/gl_implementation_android.cc

Index: ui/gl/gl_implementation_android.cc
diff --git a/ui/gl/gl_implementation_android.cc b/ui/gl/gl_implementation_android.cc
index 60baaa2651b2771c524213ba4186f4c6b0280d35..0ca23f8a3f6ae2350af868facca874192c57f7a9 100644
--- a/ui/gl/gl_implementation_android.cc
+++ b/ui/gl/gl_implementation_android.cc
@@ -2,98 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/base_paths.h"
-#include "base/command_line.h"
-#include "base/files/file_path.h"
+#include "ui/gl/gl_implementation.h"
+
 #include "base/logging.h"
-#include "base/native_library.h"
-#include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context_stub_with_extensions.h"
 #include "ui/gl/gl_egl_api_implementation.h"
 #include "ui/gl/gl_gl_api_implementation.h"
-#include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_implementation_osmesa.h"
 #include "ui/gl/gl_osmesa_api_implementation.h"
 
 namespace gl {
 
-namespace {
-
-void GL_BINDING_CALL MarshalClearDepthToClearDepthf(GLclampd depth) {
-  glClearDepthf(static_cast<GLclampf>(depth));
-}
-
-void GL_BINDING_CALL MarshalDepthRangeToDepthRangef(GLclampd z_near,
-                                                    GLclampd z_far) {
-  glDepthRangef(static_cast<GLclampf>(z_near), static_cast<GLclampf>(z_far));
-}
-
-}  // namespace
-
 void GetAllowedGLImplementations(std::vector<GLImplementation>* impls) {
   impls->push_back(kGLImplementationEGLGLES2);
   impls->push_back(kGLImplementationOSMesaGL);
 }
 
-bool InitializeStaticGLBindings(GLImplementation implementation) {
-  // Prevent reinitialization with a different implementation. Once the gpu
-  // unit tests have initialized with kGLImplementationMock, we don't want to
-  // later switch to another GL implementation.
-  DCHECK_EQ(kGLImplementationNone, GetGLImplementation());
-
-  switch (implementation) {
-    case kGLImplementationEGLGLES2: {
-      base::NativeLibrary gles_library =
-          LoadLibraryAndPrintError("libGLESv2.so");
-      if (!gles_library)
-        return false;
-      base::NativeLibrary egl_library = LoadLibraryAndPrintError("libEGL.so");
-      if (!egl_library) {
-        base::UnloadNativeLibrary(gles_library);
-        return false;
-      }
-
-      GLGetProcAddressProc get_proc_address =
-          reinterpret_cast<GLGetProcAddressProc>(
-              base::GetFunctionPointerFromNativeLibrary(
-                  egl_library, "eglGetProcAddress"));
-      if (!get_proc_address) {
-        LOG(ERROR) << "eglGetProcAddress not found.";
-        base::UnloadNativeLibrary(egl_library);
-        base::UnloadNativeLibrary(gles_library);
-        return false;
-      }
-
-      SetGLGetProcAddressProc(get_proc_address);
-      AddGLNativeLibrary(egl_library);
-      AddGLNativeLibrary(gles_library);
-      SetGLImplementation(kGLImplementationEGLGLES2);
-
-      InitializeStaticGLBindingsGL();
-      InitializeStaticGLBindingsEGL();
-
-      // These two functions take single precision float rather than double
-      // precision float parameters in GLES.
-      ::gl::g_driver_gl.fn.glClearDepthFn = MarshalClearDepthToClearDepthf;
-      ::gl::g_driver_gl.fn.glDepthRangeFn = MarshalDepthRangeToDepthRangef;
-      break;
-    }
-    case kGLImplementationOSMesaGL:
-      InitializeStaticGLBindingsOSMesaGL();
-      break;
-    case kGLImplementationMockGL: {
-      SetGLImplementation(kGLImplementationMockGL);
-      InitializeStaticGLBindingsGL();
-      break;
-    }
-    default:
-      NOTIMPLEMENTED() << "InitializeStaticGLBindings on Android";
-      return false;
-  }
-
-  return true;
-}
-
 bool InitializeDynamicGLBindings(GLImplementation implementation,
                                  GLContext* context) {
   switch (implementation) {
@@ -107,8 +31,9 @@ bool InitializeDynamicGLBindings(GLImplementation implementation,
             new GLContextStubWithExtensions());
         mock_context->SetGLVersionString("opengl es 3.0");
         InitializeDynamicGLBindingsGL(mock_context.get());
-      } else
+      } else {
         InitializeDynamicGLBindingsGL(context);
+      }
       break;
     default:
       NOTREACHED() << "InitializeDynamicGLBindings on Android";
@@ -118,21 +43,6 @@ bool InitializeDynamicGLBindings(GLImplementation implementation,
   return true;
 }
 
-void InitializeDebugGLBindings() {
-  InitializeDebugGLBindingsEGL();
-  InitializeDebugGLBindingsGL();
-  InitializeDebugGLBindingsOSMESA();
-}
-
-void ClearGLBindings() {
-  ClearGLBindingsEGL();
-  ClearGLBindingsGL();
-  ClearGLBindingsOSMESA();
-  SetGLImplementation(kGLImplementationNone);
-
-  UnloadGLNativeLibraries();
-}
-
 bool GetGLWindowSystemBindingInfo(GLWindowSystemBindingInfo* info) {
   switch (GetGLImplementation()) {
     case kGLImplementationEGLGLES2: