Revert 202787 "Remove unnecessary ui::CompositorTestSupport"

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

Index: trunk/src/ui/aura/test/test_suite.cc
===================================================================
--- trunk/src/ui/aura/test/test_suite.cc	(revision 202789)
+++ trunk/src/ui/aura/test/test_suite.cc	(working copy)
@@ -10,6 +10,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/gfx/gfx_paths.h"
 #include "ui/gl/gl_implementation.h"
 
@@ -28,11 +29,13 @@
   // Force unittests to run using en-US so if we test against string
   // output, it'll pass regardless of the system language.
   ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
+  ui::CompositorTestSupport::Initialize();
 
   ui::SetupTestCompositor();
 }
 
 void AuraTestSuite::Shutdown() {
+  ui::CompositorTestSupport::Terminate();
   ui::ResourceBundle::CleanupSharedInstance();
 
   base::TestSuite::Shutdown();