Revert 202787 "Remove unnecessary ui::CompositorTestSupport"

trunk/src/ui/aura/demo/demo_main.cc

Index: trunk/src/ui/aura/demo/demo_main.cc
===================================================================
--- trunk/src/ui/aura/demo/demo_main.cc	(revision 202789)
+++ trunk/src/ui/aura/demo/demo_main.cc	(working copy)
@@ -19,6 +19,7 @@
 #include "ui/base/hit_test.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
+#include "ui/compositor/test/compositor_test_support.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/rect.h"
 
@@ -109,6 +110,7 @@
 int DemoMain() {
   // Create the message-loop here before creating the root window.
   base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
+  ui::CompositorTestSupport::Initialize();
   aura::Env::GetInstance();
   scoped_ptr<aura::TestScreen> test_screen(aura::TestScreen::Create());
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen.get());
@@ -145,6 +147,8 @@
   root_window->ShowRootWindow();
   base::MessageLoopForUI::current()->Run();
 
+  ui::CompositorTestSupport::Terminate();
+
   return 0;
 }