| Index: content/browser/web_contents/aura/window_slider_unittest.cc
|
| diff --git a/content/browser/web_contents/aura/window_slider_unittest.cc b/content/browser/web_contents/aura/window_slider_unittest.cc
|
| index b6bd73831fcd689fcff3a7f0bc92ee8327bba403..c775c7fb33af8117e6154055697c12ff8053119e 100644
|
| --- a/content/browser/web_contents/aura/window_slider_unittest.cc
|
| +++ b/content/browser/web_contents/aura/window_slider_unittest.cc
|
| @@ -335,8 +335,8 @@ TEST_F(WindowSliderTest, WindowSlideInterruptedThenContinues) {
|
| window->SetBounds(gfx::Rect(0, 0, 400, 400));
|
| WindowSliderDelegateTest slider_delegate;
|
|
|
| - ui::ScopedAnimationDurationScaleMode normal_duration_(
|
| - ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
|
| + ui::ScopedAnimationDurationScaleMode test_duration_(
|
| + ui::ScopedAnimationDurationScaleMode::TEST_DURATION);
|
| ui::LayerAnimator* animator = window->layer()->GetAnimator();
|
| animator->set_disable_timer_for_test(true);
|
| ui::LayerAnimatorTestController test_controller(animator);
|
| @@ -589,8 +589,8 @@ TEST_F(WindowSliderTest, SwipeDuringSwipeAnimation) {
|
| WindowSliderDelegateTest slider_delegate;
|
| new WindowSlider(&slider_delegate, root_window(), window.get());
|
|
|
| - ui::ScopedAnimationDurationScaleMode normal_duration_(
|
| - ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
|
| + ui::ScopedAnimationDurationScaleMode test_duration(
|
| + ui::ScopedAnimationDurationScaleMode::TEST_DURATION);
|
| ui::LayerAnimator* animator = window->layer()->GetAnimator();
|
| animator->set_disable_timer_for_test(true);
|
| ui::LayerAnimatorTestController test_controller(animator);
|
|
|