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 /ui/aura/bench | |
| 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 'ui/aura/bench')
| -rw-r--r-- | ui/aura/bench/bench_main.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc index 20cd4dc..eb620f0 100644 --- a/ui/aura/bench/bench_main.cc +++ b/ui/aura/bench/bench_main.cc @@ -26,6 +26,7 @@ #include "ui/compositor/compositor_observer.h" #include "ui/compositor/debug_utils.h" #include "ui/compositor/layer.h" +#include "ui/compositor/test/compositor_test_support.h" #include "ui/gfx/canvas.h" #include "ui/gfx/rect.h" #include "ui/gfx/skia_util.h" @@ -296,6 +297,7 @@ int main(int argc, char** argv) { ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); MessageLoop message_loop(MessageLoop::TYPE_UI); + ui::CompositorTestSupport::Initialize(); aura::Env::GetInstance(); aura::SetUseFullscreenHostWindow(true); aura::TestScreen test_screen; @@ -354,5 +356,7 @@ int main(int argc, char** argv) { focus_client.reset(); root_window.reset(); + ui::CompositorTestSupport::Terminate(); + return 0; } |