| Index: ui/aura/window_unittest.cc
|
| diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
|
| index 5e08a170da097f9d34b11acccb75a0bce6ed295e..fa5ce404250f86e796371069ea0069f79077cbf8 100644
|
| --- a/ui/aura/window_unittest.cc
|
| +++ b/ui/aura/window_unittest.cc
|
| @@ -1625,7 +1625,7 @@ TEST_F(WindowTest, SetBoundsInternalShouldCheckTargetBounds) {
|
|
|
| EXPECT_FALSE(!w1->layer());
|
| w1->layer()->GetAnimator()->set_disable_timer_for_test(true);
|
| - gfx::AnimationContainerElement* element = w1->layer()->GetAnimator();
|
| + ui::LayerAnimator* animator = w1->layer()->GetAnimator();
|
|
|
| EXPECT_EQ("0,0 100x100", w1->bounds().ToString());
|
| EXPECT_EQ("0,0 100x100", w1->layer()->GetTargetBounds().ToString());
|
| @@ -1655,7 +1655,7 @@ TEST_F(WindowTest, SetBoundsInternalShouldCheckTargetBounds) {
|
| base::TimeTicks start_time =
|
| w1->layer()->GetAnimator()->last_step_time();
|
|
|
| - element->Step(start_time + base::TimeDelta::FromMilliseconds(1000));
|
| + animator->Step(start_time + base::TimeDelta::FromMilliseconds(1000));
|
|
|
| EXPECT_EQ("0,0 100x100", w1->bounds().ToString());
|
| }
|
| @@ -2374,8 +2374,8 @@ TEST_F(WindowTest, DelegateNotifiedAsBoundsChange) {
|
| // Animate to the end, which should notify of the change.
|
| base::TimeTicks start_time =
|
| window->layer()->GetAnimator()->last_step_time();
|
| - gfx::AnimationContainerElement* element = window->layer()->GetAnimator();
|
| - element->Step(start_time + base::TimeDelta::FromMilliseconds(1000));
|
| + ui::LayerAnimator* animator = window->layer()->GetAnimator();
|
| + animator->Step(start_time + base::TimeDelta::FromMilliseconds(1000));
|
| EXPECT_TRUE(delegate.bounds_changed());
|
| EXPECT_NE("0,0 100x100", window->bounds().ToString());
|
| }
|
| @@ -2416,8 +2416,8 @@ TEST_F(WindowTest, DelegateNotifiedAsBoundsChangeInHiddenLayer) {
|
| // Animate to the end: will *not* notify of the change since we are hidden.
|
| base::TimeTicks start_time =
|
| window->layer()->GetAnimator()->last_step_time();
|
| - gfx::AnimationContainerElement* element = window->layer()->GetAnimator();
|
| - element->Step(start_time + base::TimeDelta::FromMilliseconds(1000));
|
| + ui::LayerAnimator* animator = window->layer()->GetAnimator();
|
| + animator->Step(start_time + base::TimeDelta::FromMilliseconds(1000));
|
|
|
| // No bounds changed notification at the end of animation since layer
|
| // delegate is NULL.
|
|
|