| Index: gpu/command_buffer/common/unittest_main.cc
|
| diff --git a/gpu/command_buffer/common/unittest_main.cc b/gpu/command_buffer/common/unittest_main.cc
|
| index c48b77dec6dd930eda9acb817a4dcc48f76ae467..358805a310c33479a795b07c9b685d9870e515c6 100644
|
| --- a/gpu/command_buffer/common/unittest_main.cc
|
| +++ b/gpu/command_buffer/common/unittest_main.cc
|
| @@ -11,6 +11,7 @@
|
| #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 {
|
|
|
| @@ -19,6 +20,13 @@ class NoAtExitBaseTestSuite : public base::TestSuite {
|
| 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) {
|
| @@ -35,9 +43,6 @@ int main(int argc, char** argv) {
|
| 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,
|
|
|