diff options
Diffstat (limited to 'ui/aura/window_unittest.cc')
| -rw-r--r-- | ui/aura/window_unittest.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc index 731dfc0..8b31582 100644 --- a/ui/aura/window_unittest.cc +++ b/ui/aura/window_unittest.cc @@ -33,6 +33,7 @@ #include "ui/base/hit_test.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/compositor/layer.h" +#include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/canvas.h" #include "ui/gfx/screen.h" @@ -1613,7 +1614,8 @@ TEST_F(WindowTest, OwnedProperty) { TEST_F(WindowTest, SetBoundsInternalShouldCheckTargetBounds) { // We cannot short-circuit animations in this test. - ui::LayerAnimator::set_disable_animations_for_test(false); + ui::ScopedAnimationDurationScaleMode normal_duration_mode( + ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION); scoped_ptr<Window> w1( CreateTestWindowWithBounds(gfx::Rect(0, 0, 100, 100), root_window())); @@ -2509,7 +2511,8 @@ TEST_F(WindowTest, DelegateNotifiedAsBoundsChange) { BoundsChangeDelegate delegate; // We cannot short-circuit animations in this test. - ui::LayerAnimator::set_disable_animations_for_test(false); + ui::ScopedAnimationDurationScaleMode normal_duration_mode( + ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION); scoped_ptr<Window> window( CreateTestWindowWithDelegate(&delegate, 1, @@ -2543,7 +2546,8 @@ TEST_F(WindowTest, DelegateNotifiedAsBoundsChangeInHiddenLayer) { BoundsChangeDelegate delegate; // We cannot short-circuit animations in this test. - ui::LayerAnimator::set_disable_animations_for_test(false); + ui::ScopedAnimationDurationScaleMode normal_duration_mode( + ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION); scoped_ptr<Window> window( CreateTestWindowWithDelegate(&delegate, 1, |