Revert 247793 "Ensure GL initialization only happens once, and p..."

trunk/src/media/tools/player_x11/gl_video_renderer.cc

 // Copyright (c) 2012 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 "media/tools/player_x11/gl_video_renderer.h"
 
 #include <X11/Xutil.h>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "media/base/buffers.h"
 #include "media/base/video_frame.h"
 #include "media/base/yuv_convert.h"
-#include "ui/gl/gl_surface.h"
+#include "ui/gl/gl_implementation.h"
 
 enum { kNumYUVPlanes = 3 };
 
 static GLXContext InitGLContext(Display* display, Window window) {
   // Some versions of NVIDIA's GL libGL.so include a broken version of
   // dlopen/dlsym, and so linking it into chrome breaks it. So we dynamically
   // load it, and use glew to dynamically resolve symbols.
   // See http://code.google.com/p/chromium/issues/detail?id=16800
-  if (!gfx::GLSurface::InitializeOneOff()) {
-    LOG(ERROR) << "GLSurface::InitializeOneOff failed";
+  if (!InitializeStaticGLBindings(gfx::kGLImplementationDesktopGL)) {
+    LOG(ERROR) << "InitializeStaticGLBindings failed";
     return NULL;
   }
 
   XWindowAttributes attributes;
   XGetWindowAttributes(display, window, &attributes);
   XVisualInfo visual_info_template;
   visual_info_template.visualid = XVisualIDFromVisual(attributes.visual);
   int visual_info_count = 0;
   XVisualInfo* visual_info_list = XGetVisualInfo(display, VisualIDMask,
                                                  &visual_info_template,
@@ skipping 205 matching lines @@
   verts[0] = x0; verts[1] = y0;
   verts[2] = x0; verts[3] = y1;
   verts[4] = x1; verts[5] = y0;
   verts[6] = x1; verts[7] = y1;
   glVertexAttribPointer(tc_location, 2, GL_FLOAT, GL_FALSE, 0, verts);
 
   // We are getting called on a thread. Release the context so that it can be
   // made current on the main thread.
   glXMakeCurrent(display_, 0, NULL);
 }