Revert r274404 and r274409:

ui/aura/window_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 "ui/aura/window.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 1607 matching lines @@
 TEST_F(WindowTest, SetBoundsInternalShouldCheckTargetBounds) {
   // We cannot short-circuit animations in this test.
   ui::ScopedAnimationDurationScaleMode normal_duration_mode(
       ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
 
   scoped_ptr<Window> w1(
       CreateTestWindowWithBounds(gfx::Rect(0, 0, 100, 100), root_window()));
 
   EXPECT_FALSE(!w1->layer());
   w1->layer()->GetAnimator()->set_disable_timer_for_test(true);
-  ui::LayerAnimator* animator = w1->layer()->GetAnimator();
+  gfx::AnimationContainerElement* element = w1->layer()->GetAnimator();
 
   EXPECT_EQ("0,0 100x100", w1->bounds().ToString());
   EXPECT_EQ("0,0 100x100", w1->layer()->GetTargetBounds().ToString());
 
   // Animate to a different position.
   {
     ui::ScopedLayerAnimationSettings settings(w1->layer()->GetAnimator());
     w1->SetBounds(gfx::Rect(100, 100, 100, 100));
   }
 
   EXPECT_EQ("0,0 100x100", w1->bounds().ToString());
   EXPECT_EQ("100,100 100x100", w1->layer()->GetTargetBounds().ToString());
 
   // Animate back to the first position. The animation hasn't started yet, so
   // the current bounds are still (0, 0, 100, 100), but the target bounds are
   // (100, 100, 100, 100). If we step the animator ahead, we should find that
   // we're at (0, 0, 100, 100). That is, the second animation should be applied.
   {
     ui::ScopedLayerAnimationSettings settings(w1->layer()->GetAnimator());
     w1->SetBounds(gfx::Rect(0, 0, 100, 100));
   }
 
   EXPECT_EQ("0,0 100x100", w1->bounds().ToString());
   EXPECT_EQ("0,0 100x100", w1->layer()->GetTargetBounds().ToString());
 
   // Confirm that the target bounds are reached.
   base::TimeTicks start_time =
       w1->layer()->GetAnimator()->last_step_time();
 
-  animator->Step(start_time + base::TimeDelta::FromMilliseconds(1000));
+  element->Step(start_time + base::TimeDelta::FromMilliseconds(1000));
 
   EXPECT_EQ("0,0 100x100", w1->bounds().ToString());
 }
 
 
 typedef std::pair<const void*, intptr_t> PropertyChangeInfo;
 
 class WindowObserverTest : public WindowTest,
                            public WindowObserver {
  public:
@@ skipping 698 matching lines @@
     window->SetBounds(gfx::Rect(100, 100, 100, 100));
   }
 
   // Bounds shouldn't immediately have changed.
   EXPECT_EQ("0,0 100x100", window->bounds().ToString());
   EXPECT_FALSE(delegate.bounds_changed());
 
   // Animate to the end, which should notify of the change.
   base::TimeTicks start_time =
       window->layer()->GetAnimator()->last_step_time();
-  ui::LayerAnimator* animator = window->layer()->GetAnimator();
-  animator->Step(start_time + base::TimeDelta::FromMilliseconds(1000));
+  gfx::AnimationContainerElement* element = window->layer()->GetAnimator();
+  element->Step(start_time + base::TimeDelta::FromMilliseconds(1000));
   EXPECT_TRUE(delegate.bounds_changed());
   EXPECT_NE("0,0 100x100", window->bounds().ToString());
 }
 
 // Verifies the delegate is notified when the actual bounds of the layer
 // change even when the window is not the layer's delegate
 TEST_F(WindowTest, DelegateNotifiedAsBoundsChangeInHiddenLayer) {
   BoundsChangeDelegate delegate;
 
   // We cannot short-circuit animations in this test.
@@ skipping 20 matching lines @@
 
   // Layer delegate is NULL but we should still get bounds changed notification.
   EXPECT_EQ("100,100 110x100", window->GetTargetBounds().ToString());
   EXPECT_TRUE(delegate.bounds_changed());
 
   delegate.clear_bounds_changed();
 
   // Animate to the end: will *not* notify of the change since we are hidden.
   base::TimeTicks start_time =
       window->layer()->GetAnimator()->last_step_time();
-  ui::LayerAnimator* animator = window->layer()->GetAnimator();
-  animator->Step(start_time + base::TimeDelta::FromMilliseconds(1000));
+  gfx::AnimationContainerElement* element = window->layer()->GetAnimator();
+  element->Step(start_time + base::TimeDelta::FromMilliseconds(1000));
 
   // No bounds changed notification at the end of animation since layer
   // delegate is NULL.
   EXPECT_FALSE(delegate.bounds_changed());
   EXPECT_NE("0,0 100x100", window->layer()->bounds().ToString());
 }
 
 namespace {
 
 // Used by AddChildNotifications to track notification counts.
@@ skipping 911 matching lines @@
               BuildRootLayerTreeDescription(*root.layer()))
         << "layer tree doesn't match at " << i;
     EXPECT_EQ(data[i].expected_description,
               BuildRootWindowTreeDescription(root))
         << "window tree doesn't match at " << i;
   }
 }
 
 }  // namespace test
 }  // namespace aura