Revert 202787 "Remove unnecessary ui::CompositorTestSupport"

trunk/src/ui/keyboard/keyboard_test_suite.cc

Index: trunk/src/ui/keyboard/keyboard_test_suite.cc
===================================================================
--- trunk/src/ui/keyboard/keyboard_test_suite.cc	(revision 202789)
+++ trunk/src/ui/keyboard/keyboard_test_suite.cc	(working copy)
@@ -5,6 +5,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/compositor/compositor_setup.h"
+#include "ui/compositor/test/compositor_test_support.h"
 #include "ui/test/test_suite.h"
 
 class KeyboardTestSuite : public ui::test::UITestSuite {
@@ -24,10 +25,12 @@
 void KeyboardTestSuite::Initialize() {
   ui::test::UITestSuite::Initialize();
 
+  ui::CompositorTestSupport::Initialize();
   ui::SetupTestCompositor();
 }
 
 void KeyboardTestSuite::Shutdown() {
+  ui::CompositorTestSupport::Terminate();
   ui::test::UITestSuite::Shutdown();
 }