Revert r274404 and r274409:

ash/wm/window_animations_unittest.cc

Index: ash/wm/window_animations_unittest.cc
diff --git a/ash/wm/window_animations_unittest.cc b/ash/wm/window_animations_unittest.cc
index 0e1a4d8b24d3553cb1b3c08093f60230dc0f8ad9..7df1c4996d4f4f26d2e9589ee2266b9fbddb600b 100644
--- a/ash/wm/window_animations_unittest.cc
+++ b/ash/wm/window_animations_unittest.cc
@@ -16,6 +16,7 @@
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
+#include "ui/gfx/animation/animation_container_element.h"
 
 using aura::Window;
 using ui::Layer;
@@ -88,8 +89,11 @@ TEST_F(WindowAnimationsTest, HideShowBrightnessGrayscaleAnimation) {
   EXPECT_TRUE(window->layer()->visible());
 
   // Stays shown.
-  window->layer()->GetAnimator()->Step(base::TimeTicks::Now() +
-                                       base::TimeDelta::FromSeconds(5));
+  gfx::AnimationContainerElement* element =
+      static_cast<gfx::AnimationContainerElement*>(
+      window->layer()->GetAnimator());
+  element->Step(base::TimeTicks::Now() +
+                base::TimeDelta::FromSeconds(5));
   EXPECT_EQ(0.0f, window->layer()->GetTargetBrightness());
   EXPECT_EQ(0.0f, window->layer()->GetTargetGrayscale());
   EXPECT_TRUE(window->layer()->visible());
@@ -137,10 +141,10 @@ TEST_F(WindowAnimationsTest, CrossFadeToBounds) {
   EXPECT_EQ(gfx::Transform(), window->layer()->GetTargetTransform());
 
   // Run the animations to completion.
-  old_layer->GetAnimator()->Step(base::TimeTicks::Now() +
-                                 base::TimeDelta::FromSeconds(1));
-  window->layer()->GetAnimator()->Step(base::TimeTicks::Now() +
-                                       base::TimeDelta::FromSeconds(1));
+  static_cast<gfx::AnimationContainerElement*>(old_layer->GetAnimator())->Step(
+      base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1));
+  static_cast<gfx::AnimationContainerElement*>(window->layer()->GetAnimator())->
+      Step(base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1));
 
   // Cross fade to a smaller size, as in a restore animation.
   old_layer = window->layer();
@@ -159,10 +163,10 @@ TEST_F(WindowAnimationsTest, CrossFadeToBounds) {
   EXPECT_EQ(1.0f, window->layer()->GetTargetOpacity());
   EXPECT_EQ(gfx::Transform(), window->layer()->GetTargetTransform());
 
-  old_layer->GetAnimator()->Step(base::TimeTicks::Now() +
-                                 base::TimeDelta::FromSeconds(1));
-  window->layer()->GetAnimator()->Step(base::TimeTicks::Now() +
-                                       base::TimeDelta::FromSeconds(1));
+  static_cast<gfx::AnimationContainerElement*>(old_layer->GetAnimator())->Step(
+      base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1));
+  static_cast<gfx::AnimationContainerElement*>(window->layer()->GetAnimator())->
+      Step(base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1));
 }
 
 }  // namespace wm