diff options
author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-07 14:23:31 +0000 |
---|---|---|
committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-07 14:23:31 +0000 |
commit | 25cc88bf02e1ea4a4b19e15cb5a046532c521442 (patch) | |
tree | c6e016fdb35a523229c04ed2301543e61f7d2dec /ui/keyboard | |
parent | 24c81d69598fce9558b6a1ae2cd802ad6f7e371a (diff) | |
download | chromium_src-25cc88bf02e1ea4a4b19e15cb5a046532c521442.zip chromium_src-25cc88bf02e1ea4a4b19e15cb5a046532c521442.tar.gz chromium_src-25cc88bf02e1ea4a4b19e15cb5a046532c521442.tar.bz2 |
Revert "Clean up compositor initialization/destruction."
This reverts commit d65d6fe3c667835a8a0ddc0b917519115321d605.
The CL needs to be rebased.
TBR=piman
BUG=258625, 266565
Review URL: https://codereview.chromium.org/22570003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216183 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/keyboard')
-rw-r--r-- | ui/keyboard/keyboard_test_suite.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/keyboard/keyboard_test_suite.cc b/ui/keyboard/keyboard_test_suite.cc index dc4ec5b..5b4db504d 100644 --- a/ui/keyboard/keyboard_test_suite.cc +++ b/ui/keyboard/keyboard_test_suite.cc @@ -4,6 +4,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" +#include "ui/compositor/compositor_setup.h" #include "ui/test/test_suite.h" class KeyboardTestSuite : public ui::test::UITestSuite { @@ -22,6 +23,8 @@ class KeyboardTestSuite : public ui::test::UITestSuite { void KeyboardTestSuite::Initialize() { ui::test::UITestSuite::Initialize(); + + ui::SetupTestCompositor(); } void KeyboardTestSuite::Shutdown() { |