Revert 202787 "Remove unnecessary ui::CompositorTestSupport"

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

Index: trunk/src/ui/compositor/test/test_suite.cc
===================================================================
--- trunk/src/ui/compositor/test/test_suite.cc	(revision 202789)
+++ trunk/src/ui/compositor/test/test_suite.cc	(working copy)
@@ -9,6 +9,7 @@
 #include "ui/base/ui_base_paths.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/compositor_switches.h"
+#include "ui/compositor/test/compositor_test_support.h"
 #include "ui/gfx/gfx_paths.h"
 #include "ui/gl/gl_implementation.h"
 
@@ -36,11 +37,13 @@
   gfx::RegisterPathProvider();
 
   message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
+  CompositorTestSupport::Initialize();
   Compositor::Initialize();
 }
 
 void CompositorTestSuite::Shutdown() {
   Compositor::Terminate();
+  CompositorTestSupport::Terminate();
   message_loop_.reset();
 
   base::TestSuite::Shutdown();