diff options
| author | vollick@google.com <vollick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-01 17:37:47 +0000 |
|---|---|---|
| committer | vollick@google.com <vollick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-01 17:37:47 +0000 |
| commit | 83502cddd203d8971ce3883960afca6cfac9fdb1 (patch) | |
| tree | 952b84d47b9d883457b7c337325335794c0badfc /ui/aura/test/aura_test_base.cc | |
| parent | c3287f6e7f7c23c1f20729d4729ffdd84658c4b7 (diff) | |
| download | chromium_src-83502cddd203d8971ce3883960afca6cfac9fdb1.zip chromium_src-83502cddd203d8971ce3883960afca6cfac9fdb1.tar.gz chromium_src-83502cddd203d8971ce3883960afca6cfac9fdb1.tar.bz2 | |
Revert 120074 - Disable animations during aura tests.
This causes all animations scheduled during a test to complete immediately.
After making this change, I noticed some code assumed that animations would not complete synchronously. Some of this code used animation observers, and I while fixing the code I have updated it to use the preferred ImplicitAnimationObserver.
BUG=None
TEST=aura_shell_unittests,aura_unittests,compositor_unittests
Review URL: https://chromiumcodereview.appspot.com/9222018
TBR=vollick@google.com
Review URL: https://chromiumcodereview.appspot.com/9316039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120075 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/test/aura_test_base.cc')
| -rw-r--r-- | ui/aura/test/aura_test_base.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc index 3e1e95f..70d33f5 100644 --- a/ui/aura/test/aura_test_base.cc +++ b/ui/aura/test/aura_test_base.cc @@ -9,7 +9,6 @@ #endif #include "ui/aura/root_window.h" -#include "ui/gfx/compositor/layer_animator.h" namespace aura { namespace test { @@ -23,9 +22,6 @@ AuraTestBase::AuraTestBase() RootWindow::GetInstance()->Show(); RootWindow::GetInstance()->SetHostSize(gfx::Size(600, 600)); - - // Disable animations during tests. - ui::LayerAnimator::set_disable_animations_for_test(true); } AuraTestBase::~AuraTestBase() { |