| Index: ui/compositor/layer_animator_unittest.cc
|
| diff --git a/ui/compositor/layer_animator_unittest.cc b/ui/compositor/layer_animator_unittest.cc
|
| index 3ae8c2b34ebc10928d19d6dffc0be48bdba5359c..53b6236ea156bbdfe81af743dd93c862190ac0c0 100644
|
| --- a/ui/compositor/layer_animator_unittest.cc
|
| +++ b/ui/compositor/layer_animator_unittest.cc
|
| @@ -1890,8 +1890,8 @@ TEST(LayerAnimatorTest, ObserverDetachedBeforeAnimationFinished) {
|
| // causes the second to be deleted, we should not attempt to animate the second
|
| // animation.
|
| TEST(LayerAnimatorTest, ObserverDeletesAnimationsOnEnd) {
|
| - ScopedAnimationDurationScaleMode normal_duration_mode(
|
| - ScopedAnimationDurationScaleMode::NORMAL_DURATION);
|
| + ScopedAnimationDurationScaleMode test_duration_mode(
|
| + ScopedAnimationDurationScaleMode::TEST_DURATION);
|
| scoped_refptr<LayerAnimator> animator(new TestLayerAnimator());
|
| animator->set_disable_timer_for_test(true);
|
| TestLayerAnimationDelegate delegate;
|
| @@ -2000,8 +2000,8 @@ TEST(LayerAnimatorTest, CallbackDeletesAnimationInProgress) {
|
| // tests the behavior when the OnLayerAnimationAborted() callback causes
|
| // all of the animator's other animations to be deleted.
|
| TEST(LayerAnimatorTest, ObserverDeletesAnimationsOnAbort) {
|
| - ScopedAnimationDurationScaleMode normal_duration_mode(
|
| - ScopedAnimationDurationScaleMode::NORMAL_DURATION);
|
| + ScopedAnimationDurationScaleMode test_duration_mode(
|
| + ScopedAnimationDurationScaleMode::TEST_DURATION);
|
| scoped_refptr<LayerAnimator> animator(new TestLayerAnimator());
|
| animator->set_disable_timer_for_test(true);
|
| TestLayerAnimationDelegate delegate;
|
|
|