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 55bc1b86090353d931d211aaf26b0c530e183825..0a2e08914b1633a25d84ab3b78096b9eaa7504aa 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);

[no sievers, 2014/01/14 23:16:01]

Adding InitializePreBindingsInternal() everywhere makes the code a bit harder to
follow (and it's already pretty confusing). Would it work to simply call
GLSurfaceWGL::InitializeOneOff() from gl_implementation_win.cc?

[oetuaho-nv, 2014/01/15 15:50:25]

I agree, done.

+  if (initialized)
+    initialized = InitializeStaticGLBindings(impl) &&
+                  InitializeOneOffInternal();
   if (!initialized && fallback_to_osmesa) {
     ClearGLBindings();
-    initialized = InitializeGLBindings(kGLImplementationOSMesaGL) &&
+    initialized = InitializeStaticGLBindings(kGLImplementationOSMesaGL) &&
                   InitializeOneOffInternal();
   }