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/window_unittest.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/window_unittest.cc')
| -rw-r--r-- | ui/aura/window_unittest.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc index 78b9142..1e59c2d 100644 --- a/ui/aura/window_unittest.cc +++ b/ui/aura/window_unittest.cc @@ -933,9 +933,6 @@ TEST_F(WindowTest, Property) { } TEST_F(WindowTest, SetBoundsInternalShouldCheckTargetBounds) { - // We cannot short-circuit animations in this test. - ui::LayerAnimator::set_disable_animations_for_test(false); - scoped_ptr<Window> w1( CreateTestWindowWithBounds(gfx::Rect(0, 0, 100, 100), NULL)); @@ -969,7 +966,7 @@ TEST_F(WindowTest, SetBoundsInternalShouldCheckTargetBounds) { // Confirm that the target bounds are reached. base::TimeTicks start_time = - w1->layer()->GetAnimator()->last_step_time(); + w1->layer()->GetAnimator()->get_last_step_time_for_test(); element->Step(start_time + base::TimeDelta::FromMilliseconds(1000)); |