Revert 216780 "Clean up compositor initialization/destruction."

trunk/src/components/test/run_all_unittests.cc

Index: trunk/src/components/test/run_all_unittests.cc
===================================================================
--- trunk/src/components/test/run_all_unittests.cc	(revision 216906)
+++ trunk/src/components/test/run_all_unittests.cc	(working copy)
@@ -6,6 +6,7 @@
 #include "base/test/test_suite.h"
 #include "content/public/test/test_content_client_initializer.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/compositor/compositor_setup.h"
 
 namespace components {
 
@@ -33,6 +34,9 @@
 int main(int argc, char** argv) {
   base::TestSuite test_suite(argc, argv);
 
+  // Mock out the compositor on platforms that use it.
+  ui::SetupTestCompositor();
+
   // The listener will set up common test environment for all components unit
   // tests.
   testing::TestEventListeners& listeners =