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

trunk/src/cc/test/layer_tree_pixel_test.cc

Index: trunk/src/cc/test/layer_tree_pixel_test.cc
===================================================================
--- trunk/src/cc/test/layer_tree_pixel_test.cc	(revision 247809)
+++ trunk/src/cc/test/layer_tree_pixel_test.cc	(working copy)
@@ -21,6 +21,7 @@
 #include "cc/trees/layer_tree_impl.h"
 #include "gpu/command_buffer/client/gl_in_process_context.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
+#include "ui/gl/gl_implementation.h"
 
 using gpu::gles2::GLES2Interface;
 
@@ -54,6 +55,8 @@
 
     case GL_WITH_DEFAULT:
     case GL_WITH_BITMAP: {
+      CHECK(gfx::InitializeStaticGLBindings(gfx::kGLImplementationOSMesaGL));
+
       output_surface = make_scoped_ptr(
           new PixelTestOutputSurface(new TestInProcessContextProvider));
       break;
@@ -313,6 +316,8 @@
   DCHECK_GT(bitmap.width(), 0);
   DCHECK_GT(bitmap.height(), 0);
 
+  CHECK(gfx::InitializeStaticGLBindings(gfx::kGLImplementationOSMesaGL));
+
   scoped_ptr<gpu::GLInProcessContext> context = CreateTestInProcessContext();
   GLES2Interface* gl = context->GetImplementation();