Take GL version and extensions correctly into account when binding functions

ui/gl/gl_surface.cc

Index: ui/gl/gl_surface.cc
diff --git a/ui/gl/gl_surface.cc b/ui/gl/gl_surface.cc
index f09aa35924daf21f1ab19a5eb57ba463eb8e011c..476e0704a3d21583e3eefa70aebbe94e3187d890 100644
--- a/ui/gl/gl_surface.cc
+++ b/ui/gl/gl_surface.cc
@@ -13,7 +13,6 @@
 #include "base/logging.h"
 #include "base/threading/thread_local.h"
 #include "ui/gl/gl_context.h"
-#include "ui/gl/gl_implementation.h"
 
 namespace gfx {
 
@@ -55,10 +54,13 @@ bool GLSurface::InitializeOneOff() {
     }
   }
 
-  initialized = InitializeGLBindings(impl) && InitializeOneOffInternal();
+  initialized = InitializePreBindingsInternal(impl);
+  if (initialized)
+    initialized = InitializeStaticGLBindings(impl) &&
+                  InitializeOneOffInternal();
   if (!initialized && fallback_to_osmesa) {
     ClearGLBindings();
-    initialized = InitializeGLBindings(kGLImplementationOSMesaGL) &&
+    initialized = InitializeStaticGLBindings(kGLImplementationOSMesaGL) &&
                   InitializeOneOffInternal();
   }