Revert 216780 "Clean up compositor initialization/destruction."

trunk/src/ui/message_center/test/run_all_unittests.cc

Index: trunk/src/ui/message_center/test/run_all_unittests.cc
===================================================================
--- trunk/src/ui/message_center/test/run_all_unittests.cc	(revision 216906)
+++ trunk/src/ui/message_center/test/run_all_unittests.cc	(working copy)
@@ -9,6 +9,10 @@
 #include "ui/test/test_suite.h"
 #include "ui/views/view.h"
 
+#if defined(TOOLKIT_VIEWS)
+#include "ui/compositor/compositor_setup.h"
+#endif
+
 class MessageCenterTestSuite : public ui::test::UITestSuite {
  public:
   MessageCenterTestSuite(int argc, char** argv)
@@ -25,6 +29,10 @@
 
 void MessageCenterTestSuite::Initialize() {
   ui::test::UITestSuite::Initialize();
+
+#if defined(TOOLKIT_VIEWS)
+  ui::SetupTestCompositor();
+#endif
 }
 
 void MessageCenterTestSuite::Shutdown() {
Property changes on: trunk/src/ui/message_center/test/run_all_unittests.cc
___________________________________________________________________
Deleted: svn:mergeinfo