Revert 202787 "Remove unnecessary ui::CompositorTestSupport"

trunk/src/ui/views/run_all_unittests.cc

Index: trunk/src/ui/views/run_all_unittests.cc
===================================================================
--- trunk/src/ui/views/run_all_unittests.cc	(revision 202789)
+++ trunk/src/ui/views/run_all_unittests.cc	(working copy)
@@ -8,6 +8,7 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/compositor/compositor_setup.h"
+#include "ui/compositor/test/compositor_test_support.h"
 #include "ui/views/view.h"
 
 class ViewTestSuite : public base::TestSuite {
@@ -20,9 +21,14 @@
     ui::RegisterPathProvider();
     ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
 
+    ui::CompositorTestSupport::Initialize();
     ui::SetupTestCompositor();
   }
 
+  virtual void Shutdown() OVERRIDE {
+    ui::CompositorTestSupport::Terminate();
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(ViewTestSuite);
 };