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

trunk/src/gpu/tools/compositor_model_bench/compositor_model_bench.cc

Index: trunk/src/gpu/tools/compositor_model_bench/compositor_model_bench.cc
===================================================================
--- trunk/src/gpu/tools/compositor_model_bench/compositor_model_bench.cc	(revision 247809)
+++ trunk/src/gpu/tools/compositor_model_bench/compositor_model_bench.cc	(working copy)
@@ -31,11 +31,12 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
+
 #include "gpu/tools/compositor_model_bench/render_model_utils.h"
 #include "gpu/tools/compositor_model_bench/render_models.h"
 #include "gpu/tools/compositor_model_bench/render_tree.h"
-#include "ui/gl/gl_surface.h"
 
+
 using base::TimeTicks;
 using base::DirectoryExists;
 using base::PathExists;
@@ -185,8 +186,8 @@
 
   // Initialize the OpenGL context.
   bool InitGLContext() {
-    if (!gfx::GLSurface::InitializeOneOff()) {
-      LOG(FATAL) << "gfx::GLSurface::InitializeOneOff failed";
+    if (!InitializeStaticGLBindings(gfx::kGLImplementationDesktopGL)) {
+      LOG(FATAL) << "InitializeStaticGLBindings failed";
       return false;
     }