Revert 216780 "Clean up compositor initialization/destruction."

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/compositor/test/test_suite.h"
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/compositor/compositor.h"
@@ skipping 10 matching lines @@
 
 CompositorTestSuite::CompositorTestSuite(int argc, char** argv)
     : TestSuite(argc, argv) {}
 
 CompositorTestSuite::~CompositorTestSuite() {}
 
 void CompositorTestSuite::Initialize() {
 #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();
 }
 
 }  // namespace test
 }  // namespace ui