Revert 216780 "Clean up compositor initialization/destruction."

trunk/src/ui/compositor/test/test_suite.cc

Index: trunk/src/ui/compositor/test/test_suite.cc
===================================================================
--- trunk/src/ui/compositor/test/test_suite.cc	(revision 216906)
+++ trunk/src/ui/compositor/test/test_suite.cc	(working copy)
@@ -28,15 +28,19 @@
 #if defined(USE_X11)
   XInitThreads();
 #endif
-  CHECK(gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL));
+#if defined(OS_LINUX)
+  gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL);
+#endif
   base::TestSuite::Initialize();
 
   gfx::RegisterPathProvider();
 
   message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
+  Compositor::Initialize();
 }
 
 void CompositorTestSuite::Shutdown() {
+  Compositor::Terminate();
   message_loop_.reset();
 
   base::TestSuite::Shutdown();
Property changes on: trunk/src/ui/compositor/test/test_suite.cc
___________________________________________________________________
Deleted: svn:mergeinfo