Revert r274404 and r274409:

content/browser/web_contents/aura/window_slider_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/web_contents/aura/window_slider.h"
 
 #include "base/bind.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/test/aura_test_base.h"
@@ skipping 323 matching lines @@
 // Tests that the window slide can continue after it is interrupted by another
 // event if the user continues scrolling.
 TEST_F(WindowSliderTest, WindowSlideInterruptedThenContinues) {
   scoped_ptr<aura::Window> window(CreateNormalWindow(0, root_window(), NULL));
   window->SetBounds(gfx::Rect(0, 0, 400, 400));
   WindowSliderDelegateTest slider_delegate;
 
   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);
 
   WindowSlider* slider =
       new WindowSlider(&slider_delegate, root_window(), window.get());
 
   ui::MouseEvent interrupt_event(ui::ET_MOUSE_MOVED,
                                  gfx::Point(55, 10),
                                  gfx::Point(55, 10),
                                  0, 0);
@@ skipping 66 matching lines @@
   EXPECT_TRUE(animator->is_animating());
   EXPECT_TRUE(slider_delegate.slide_completing());
   EXPECT_FALSE(slider_delegate.created_front_layer());
   EXPECT_FALSE(slider_delegate.slide_completed());
   EXPECT_FALSE(slider_delegate.slider_destroyed());
 
   // Progress the animator to complete the slide animation.
   ui::ScopedLayerAnimationSettings settings(animator);
   base::TimeDelta duration = settings.GetTransitionDuration();
   test_controller.StartThreadedAnimationsIfNeeded();
-  animator->Step(gfx::FrameTime::Now() + duration);
+  element->Step(gfx::FrameTime::Now() + duration);
 
   EXPECT_TRUE(slider_delegate.slide_completed());
   EXPECT_FALSE(slider_delegate.slider_destroyed());
 
   window.reset();
   EXPECT_TRUE(slider_delegate.slider_destroyed());
 }
 
 // Tests that the slide works correctly when the owner of the window changes
 // during the duration of the slide.
@@ skipping 147 matching lines @@
 // the first swipe, ask the delegate to create a new layer, and animate it.
 TEST_F(WindowSliderTest, SwipeDuringSwipeAnimation) {
   scoped_ptr<aura::Window> window(CreateNormalWindow(0, root_window(), NULL));
   window->SetBounds(gfx::Rect(0, 0, 400, 400));
   WindowSliderDelegateTest slider_delegate;
   new WindowSlider(&slider_delegate, root_window(), window.get());
 
   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);
 
   aura::test::EventGenerator generator(root_window());
 
   // Swipe forward so that |window|'s layer is the one animating.
   generator.GestureScrollSequence(
       gfx::Point(10, 10),
       gfx::Point(180, 10),
       base::TimeDelta::FromMilliseconds(10),
       2);
   EXPECT_TRUE(slider_delegate.created_back_layer());
   EXPECT_FALSE(slider_delegate.slide_aborted());
   EXPECT_FALSE(slider_delegate.created_front_layer());
   EXPECT_TRUE(slider_delegate.slide_completing());
   EXPECT_FALSE(slider_delegate.slide_completed());
   EXPECT_FALSE(slider_delegate.slider_destroyed());
   ui::ScopedLayerAnimationSettings settings(animator);
   base::TimeDelta duration = settings.GetTransitionDuration();
   test_controller.StartThreadedAnimationsIfNeeded();
   base::TimeTicks start_time1 =  gfx::FrameTime::Now();
 
-  animator->Step(start_time1 + duration / 2);
+  element->Step(start_time1 + duration/2);
   EXPECT_FALSE(slider_delegate.slide_completed());
   slider_delegate.Reset();
   // Generate another horizontal swipe while the animation from the previous
   // swipe is in progress.
   generator.GestureScrollSequence(
       gfx::Point(10, 10),
       gfx::Point(180, 10),
       base::TimeDelta::FromMilliseconds(10),
       2);
   // Performing the second swipe should instantly complete the slide started
   // by the first swipe and create a new layer.
   EXPECT_TRUE(slider_delegate.created_back_layer());
   EXPECT_FALSE(slider_delegate.slide_aborted());
   EXPECT_FALSE(slider_delegate.created_front_layer());
   EXPECT_TRUE(slider_delegate.slide_completing());
   EXPECT_TRUE(slider_delegate.slide_completed());
   EXPECT_FALSE(slider_delegate.slider_destroyed());
   test_controller.StartThreadedAnimationsIfNeeded();
   base::TimeTicks start_time2 =  gfx::FrameTime::Now();
   slider_delegate.Reset();
-  animator->Step(start_time2 + duration);
+  element->Step(start_time2 + duration);
   // The animation for the second slide should now be completed.
   EXPECT_TRUE(slider_delegate.slide_completed());
   slider_delegate.Reset();
 
   window.reset();
   EXPECT_TRUE(slider_delegate.slider_destroyed());
 }
 
 }  // namespace content