Index: ui/aura/window_unittest.cc |
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc |
index ae548c44887fb29951593ce3bc747ea409228870..69f7ff93611e28f05af6965891538a6becbc2507 100644 |
--- a/ui/aura/window_unittest.cc |
+++ b/ui/aura/window_unittest.cc |
@@ -1623,8 +1623,8 @@ TEST_F(WindowTest, OwnedProperty) { |
TEST_F(WindowTest, SetBoundsInternalShouldCheckTargetBounds) { |
// We cannot short-circuit animations in this test. |
- ui::ScopedAnimationDurationScaleMode normal_duration_mode( |
- ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION); |
+ ui::ScopedAnimationDurationScaleMode test_duration_mode( |
+ ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION); |
scoped_ptr<Window> w1( |
CreateTestWindowWithBounds(gfx::Rect(0, 0, 100, 100), root_window())); |
@@ -2242,8 +2242,8 @@ TEST_F(WindowTest, RootWindowSetWhenReparenting) { |
parent1.AddChild(&child); |
// We need animations to start in order to observe the bounds changes. |
- ui::ScopedAnimationDurationScaleMode animation_duration_mode( |
- ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION); |
+ ui::ScopedAnimationDurationScaleMode test_duration_mode( |
+ ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION); |
ui::ScopedLayerAnimationSettings settings1(child.layer()->GetAnimator()); |
settings1.SetTransitionDuration(base::TimeDelta::FromMilliseconds(100)); |
gfx::Rect new_bounds(gfx::Rect(35, 35, 50, 50)); |
@@ -2357,8 +2357,8 @@ TEST_F(WindowTest, DelegateNotifiedAsBoundsChange) { |
BoundsChangeDelegate delegate; |
// We cannot short-circuit animations in this test. |
- ui::ScopedAnimationDurationScaleMode normal_duration_mode( |
- ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION); |
+ ui::ScopedAnimationDurationScaleMode test_duration_mode( |
+ ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION); |
scoped_ptr<Window> window( |
CreateTestWindowWithDelegate(&delegate, 1, |
@@ -2392,8 +2392,8 @@ TEST_F(WindowTest, DelegateNotifiedAsBoundsChangeInHiddenLayer) { |
BoundsChangeDelegate delegate; |
// We cannot short-circuit animations in this test. |
- ui::ScopedAnimationDurationScaleMode normal_duration_mode( |
- ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION); |
+ ui::ScopedAnimationDurationScaleMode test_duration_mode( |
+ ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION); |
scoped_ptr<Window> window( |
CreateTestWindowWithDelegate(&delegate, 1, |
@@ -3395,8 +3395,8 @@ class TestLayerAnimationObserver : public ui::LayerAnimationObserver { |
} |
TEST_F(WindowTest, WindowDestroyCompletesAnimations) { |
- ui::ScopedAnimationDurationScaleMode normal_duration_mode( |
- ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION); |
+ ui::ScopedAnimationDurationScaleMode test_duration_mode( |
+ ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION); |
scoped_refptr<ui::LayerAnimator> animator = |
ui::LayerAnimator::CreateImplicitAnimator(); |
TestLayerAnimationObserver observer; |