Revert r274404 and r274409:

ash/wm/window_animations_unittest.cc

 // Copyright (c) 2012 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 "ash/wm/window_animations.h"
 
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/time/time.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #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;
 
 namespace ash {
 class WindowAnimationsTest : public ash::test::AshTestBase {
  public:
   WindowAnimationsTest() {}
 
   virtual void TearDown() OVERRIDE {
@@ skipping 52 matching lines @@
   // Showing.
   ::wm::SetWindowVisibilityAnimationType(
       window.get(),
       WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE);
   AnimateOnChildWindowVisibilityChanged(window.get(), true);
   EXPECT_EQ(0.0f, window->layer()->GetTargetBrightness());
   EXPECT_EQ(0.0f, window->layer()->GetTargetGrayscale());
   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());
 }
 
 TEST_F(WindowAnimationsTest, LayerTargetVisibility) {
   scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
 
   // Layer target visibility changes according to Show/Hide.
   window->Show();
@@ skipping 27 matching lines @@
   EXPECT_EQ("5,10 320x240", old_layer->bounds().ToString());
   gfx::Transform grow_transform;
   grow_transform.Translate(-5.f, -10.f);
   grow_transform.Scale(640.f / 320.f, 480.f / 240.f);
   EXPECT_EQ(grow_transform, old_layer->GetTargetTransform());
   // New layer animates in to the identity transform.
   EXPECT_EQ(1.0f, window->layer()->GetTargetOpacity());
   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();
   GetWindowState(window.get())->SetBoundsDirectCrossFade(
       gfx::Rect(5, 10, 320, 240));
   // Again, window layer has been replaced.
   EXPECT_NE(old_layer, window->layer());
   // Original layer fades out and stretches down to new size.
   EXPECT_EQ(0.0f, old_layer->GetTargetOpacity());
   EXPECT_EQ("0,0 640x480", old_layer->bounds().ToString());
   gfx::Transform shrink_transform;
   shrink_transform.Translate(5.f, 10.f);
   shrink_transform.Scale(320.f / 640.f, 240.f / 480.f);
   EXPECT_EQ(shrink_transform, old_layer->GetTargetTransform());
   // New layer animates in to the identity transform.
   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
 
 TEST_F(WindowAnimationsTest, LockAnimationDuration) {
   ui::ScopedAnimationDurationScaleMode normal_duration_mode(
       ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
 
   scoped_ptr<Window> window(CreateTestWindowInShellWithId(0));
   Layer* layer = window->layer();
@@ skipping 61 matching lines @@
     EXPECT_TRUE(layer->GetAnimator()->is_animating());
     // Expect default duration (200ms for stock ash minimizing animation).
     EXPECT_EQ(default_duration.InMilliseconds(),
               layer->GetAnimator()->GetTransitionDuration().InMilliseconds());
     window->Show();
     layer->GetAnimator()->StopAnimating();
   }
 }
 
 }  // namespace ash