| 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 21a8d17472352ef5d948fad4493124c3f91ca256..c0e377d4e7a0c611fc4f4f496e5237794f545c35 100644
|
| --- a/content/browser/web_contents/aura/window_slider_unittest.cc
|
| +++ b/content/browser/web_contents/aura/window_slider_unittest.cc
|
| @@ -341,7 +341,6 @@ TEST_F(WindowSliderTest, WindowSlideInterruptedThenContinues) {
|
| ui::ScopedAnimationDurationScaleMode normal_duration_(
|
| ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
|
| ui::LayerAnimator* animator = window->layer()->GetAnimator();
|
| - gfx::AnimationContainerElement* element = animator;
|
| animator->set_disable_timer_for_test(true);
|
| ui::LayerAnimatorTestController test_controller(animator);
|
|
|
| @@ -428,7 +427,7 @@ TEST_F(WindowSliderTest, WindowSlideInterruptedThenContinues) {
|
| ui::ScopedLayerAnimationSettings settings(animator);
|
| base::TimeDelta duration = settings.GetTransitionDuration();
|
| test_controller.StartThreadedAnimationsIfNeeded();
|
| - element->Step(gfx::FrameTime::Now() + duration);
|
| + animator->Step(gfx::FrameTime::Now() + duration);
|
|
|
| EXPECT_TRUE(slider_delegate.slide_completed());
|
| EXPECT_FALSE(slider_delegate.slider_destroyed());
|
| @@ -596,7 +595,6 @@ TEST_F(WindowSliderTest, SwipeDuringSwipeAnimation) {
|
| ui::ScopedAnimationDurationScaleMode normal_duration_(
|
| ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
|
| ui::LayerAnimator* animator = window->layer()->GetAnimator();
|
| - gfx::AnimationContainerElement* element = animator;
|
| animator->set_disable_timer_for_test(true);
|
| ui::LayerAnimatorTestController test_controller(animator);
|
|
|
| @@ -619,7 +617,7 @@ TEST_F(WindowSliderTest, SwipeDuringSwipeAnimation) {
|
| test_controller.StartThreadedAnimationsIfNeeded();
|
| base::TimeTicks start_time1 = gfx::FrameTime::Now();
|
|
|
| - element->Step(start_time1 + duration/2);
|
| + animator->Step(start_time1 + duration / 2);
|
| EXPECT_FALSE(slider_delegate.slide_completed());
|
| slider_delegate.Reset();
|
| // Generate another horizontal swipe while the animation from the previous
|
| @@ -640,7 +638,7 @@ TEST_F(WindowSliderTest, SwipeDuringSwipeAnimation) {
|
| test_controller.StartThreadedAnimationsIfNeeded();
|
| base::TimeTicks start_time2 = gfx::FrameTime::Now();
|
| slider_delegate.Reset();
|
| - element->Step(start_time2 + duration);
|
| + animator->Step(start_time2 + duration);
|
| // The animation for the second slide should now be completed.
|
| EXPECT_TRUE(slider_delegate.slide_completed());
|
| slider_delegate.Reset();
|
|
|