diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-29 00:04:54 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-29 00:04:54 +0000 |
| commit | 2f81e7ef3dec3d7998bc76e0821bef6b56698d9b (patch) | |
| tree | 371bce5a444699ecbeb462bcf25a5c11c5654a88 /chrome/test/base/view_event_test_base.cc | |
| parent | 758b4ea6ba8cc780e7f664d4140a0ef39c59fa83 (diff) | |
| download | chromium_src-2f81e7ef3dec3d7998bc76e0821bef6b56698d9b.zip chromium_src-2f81e7ef3dec3d7998bc76e0821bef6b56698d9b.tar.gz chromium_src-2f81e7ef3dec3d7998bc76e0821bef6b56698d9b.tar.bz2 | |
Revert 170082 - Remove compositor_test_support
It is not needed anymore after https://codereview.chromium.org/11415089/
BUG=159278
Review URL: https://chromiumcodereview.appspot.com/11419166
TBR=piman@chromium.org
Review URL: https://codereview.chromium.org/11418222
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170101 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/view_event_test_base.cc')
| -rw-r--r-- | chrome/test/base/view_event_test_base.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc index e0af8be..f3948d1 100644 --- a/chrome/test/base/view_event_test_base.cc +++ b/chrome/test/base/view_event_test_base.cc @@ -11,6 +11,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/browser_thread.h" #include "ui/base/ime/text_input_test_support.h" +#include "ui/compositor/test/compositor_test_support.h" #include "ui/ui_controls/ui_controls.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" @@ -85,6 +86,7 @@ void ViewEventTestBase::Done() { void ViewEventTestBase::SetUp() { ui::TextInputTestSupport::Initialize(); + ui::CompositorTestSupport::Initialize(); #if defined(USE_ASH) ash::Shell::CreateInstance(new ash::test::TestShellDelegate()); #endif @@ -107,6 +109,7 @@ void ViewEventTestBase::TearDown() { #if defined(USE_AURA) aura::Env::DeleteInstance(); #endif + ui::CompositorTestSupport::Terminate(); ui::TextInputTestSupport::Shutdown(); } |