Revert 216780 "Clean up compositor initialization/destruction."

trunk/src/content/public/test/content_test_suite_base.cc

Index: trunk/src/content/public/test/content_test_suite_base.cc
===================================================================
--- trunk/src/content/public/test/content_test_suite_base.cc	(revision 216906)
+++ trunk/src/content/public/test/content_test_suite_base.cc	(working copy)
@@ -16,6 +16,7 @@
 #include "media/base/media.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/ui_base_paths.h"
+#include "ui/compositor/compositor_setup.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
@@ -71,6 +72,9 @@
   RegisterPathProvider();
   ui::RegisterPathProvider();
 
+  // Mock out the compositor on platforms that use it.
+  ui::SetupTestCompositor();
+
   testing::UnitTest::GetInstance()->listeners().Append(
       new ContentTestSuiteBaseListener);
 }
Property changes on: trunk/src/content/public/test/content_test_suite_base.cc
___________________________________________________________________
Deleted: svn:mergeinfo