Index: gpu/command_buffer/tests/gl_tests_main.cc |
diff --git a/gpu/command_buffer/tests/gl_tests_main.cc b/gpu/command_buffer/tests/gl_tests_main.cc |
index 7b7d8d86ec25bae20b598c517991b0fa637bca28..6ac571979c3333ba8b5850af05c2df4172b3cda4 100644 |
--- a/gpu/command_buffer/tests/gl_tests_main.cc |
+++ b/gpu/command_buffer/tests/gl_tests_main.cc |
@@ -24,7 +24,14 @@ |
namespace { |
int RunHelper(base::TestSuite* testSuite) { |
+#if defined(USE_OZONE) |
+ base::MessageLoopForUI main_loop; |
+#else |
base::MessageLoopForIO message_loop; |
+#endif |
+ gfx::GLSurface::InitializeOneOff(); |
+ ::gles2::Initialize(); |
+ gpu::ApplyGpuDriverBugWorkarounds(base::CommandLine::ForCurrentProcess()); |
return testSuite->Run(); |
} |
@@ -39,9 +46,6 @@ int main(int argc, char** argv) { |
#if defined(OS_MACOSX) |
base::mac::ScopedNSAutoreleasePool pool; |
#endif |
- gfx::GLSurface::InitializeOneOff(); |
- ::gles2::Initialize(); |
- gpu::ApplyGpuDriverBugWorkarounds(base::CommandLine::ForCurrentProcess()); |
testing::InitGoogleMock(&argc, argv); |
return base::LaunchUnitTestsSerially( |
argc, |