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

trunk/src/gpu/command_buffer/common/unittest_main.cc

Index: trunk/src/gpu/command_buffer/common/unittest_main.cc
===================================================================
--- trunk/src/gpu/command_buffer/common/unittest_main.cc	(revision 247809)
+++ trunk/src/gpu/command_buffer/common/unittest_main.cc	(working copy)
@@ -11,7 +11,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"
 
 namespace {
 
@@ -20,13 +19,6 @@
   NoAtExitBaseTestSuite(int argc, char** argv)
       : base::TestSuite(argc, argv, false) {
   }
-
-  virtual void Initialize() OVERRIDE {
-    base::TestSuite::Initialize();
-    gfx::SetGLGetProcAddressProc(gfx::MockGLInterface::GetGLProcAddress);
-    gfx::GLSurface::InitializeOneOffWithMockBindingsForTests();
-    gfx::GLSurface::InitializeDynamicMockBindingsForTests(NULL);
-  }
 };
 
 int RunTestSuite(int argc, char** argv) {
@@ -43,6 +35,9 @@
   base::AtExitManager exit_manager;
 #endif
   CommandLine::Init(argc, argv);
+  gfx::SetGLGetProcAddressProc(gfx::MockGLInterface::GetGLProcAddress);
+  gfx::InitializeStaticGLBindings(gfx::kGLImplementationMockGL);
+  gfx::InitializeDynamicGLBindings(gfx::kGLImplementationMockGL, NULL);
   testing::InitGoogleMock(&argc, argv);
   return base::LaunchUnitTests(argc,
                                argv,