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

trunk/src/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

Index: trunk/src/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
===================================================================
--- trunk/src/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc	(revision 247809)
+++ trunk/src/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc	(working copy)
@@ -22,7 +22,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_mock.h"
-#include "ui/gl/gl_surface.h"
 
 using ::gfx::MockGLInterface;
 using ::testing::_;
@@ -116,8 +115,9 @@
     const CommandLine* command_line) {
   Framebuffer::ClearFramebufferCompleteComboMap();
 
+  gfx::ClearGLBindings();
   gfx::SetGLGetProcAddressProc(gfx::MockGLInterface::GetGLProcAddress);
-  gfx::GLSurface::InitializeOneOffWithMockBindingsForTests();
+  gfx::InitializeStaticGLBindings(gfx::kGLImplementationMockGL);
 
   gl_.reset(new StrictMock<MockGLInterface>());
   ::gfx::MockGLInterface::SetGLInterface(gl_.get());
@@ -289,7 +289,7 @@
   context_->SetGLVersionString(gl_version);
 
   context_->MakeCurrent(surface_.get());
-  gfx::GLSurface::InitializeDynamicMockBindingsForTests(context_);
+  gfx::InitializeDynamicGLBindings(gfx::kGLImplementationMockGL, context_);
 
   int32 attributes[] = {
     EGL_ALPHA_SIZE, request_alpha ? 8 : 0,