use-gl=desktop mode got broken in r109111. GL proc addresses were not being found because ::GetPr...

ui/gfx/gl/gl_surface_wgl.cc

 // Copyright (c) 2011 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/gfx/gl/gl_surface_wgl.h"
 
 #include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
 #include "ui/gfx/gl/gl_bindings.h"
 
 namespace gfx {
 
 namespace {
 const PIXELFORMATDESCRIPTOR kPixelFormatDescriptor = {
   sizeof(kPixelFormatDescriptor),    // Size of structure.
   1,                       // Default version.
   PFD_DRAW_TO_WINDOW |     // Window drawing support.
   PFD_SUPPORT_OPENGL |     // OpenGL support.
@@ skipping 132 matching lines @@
 void* GLSurfaceWGL::GetDisplay() {
   return GetDisplayDC();
 }
 
 bool GLSurfaceWGL::InitializeOneOff() {
   static bool initialized = false;
   if (initialized)
     return true;
 
   DCHECK(g_display == NULL);
-  g_display = new DisplayWGL;
-  if (!g_display->Init()) {
-    delete g_display;
-    g_display = NULL;
+  scoped_ptr<DisplayWGL> wgl_display(new DisplayWGL);
+  if (!wgl_display->Init())
+    return false;
+
+  // Create a temporary GL context to bind to extension entry points.
+  HGLRC gl_context = wglCreateContext(wgl_display->device_context());
+  if (!gl_context) {
+    LOG(ERROR) << "Failed to create temporary context.";
     return false;
   }
+  if (!wglMakeCurrent(wgl_display->device_context(), gl_context)) {
+    LOG(ERROR) << "Failed to make temporary GL context current.";
+    wglDeleteContext(gl_context);
+    return false;
+  }
+  // Get bindings to extension functions that cannot be acquired without a
+  // current context.
+  InitializeGLBindingsGL();
+  InitializeGLBindingsWGL();
 
+  wglMakeCurrent(NULL, NULL);
+  wglDeleteContext(gl_context);
+
+  g_display = wgl_display.release();
   initialized = true;
   return true;
 }
 
 HDC GLSurfaceWGL::GetDisplayDC() {
   return g_display->device_context();
 }
 
 NativeViewGLSurfaceWGL::NativeViewGLSurfaceWGL(gfx::PluginWindowHandle window)
     : window_(window),
@@ skipping 162 matching lines @@
 
 gfx::Size PbufferGLSurfaceWGL::GetSize() {
   return size_;
 }
 
 void* PbufferGLSurfaceWGL::GetHandle() {
   return device_context_;
 }
 
 }  // namespace gfx