summaryrefslogtreecommitdiffstats
path: root/ui/aura/window_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ui/aura/window_unittest.cc')
-rw-r--r--ui/aura/window_unittest.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index 78b9142..1e59c2d 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -933,9 +933,6 @@ TEST_F(WindowTest, Property) {
}
TEST_F(WindowTest, SetBoundsInternalShouldCheckTargetBounds) {
- // We cannot short-circuit animations in this test.
- ui::LayerAnimator::set_disable_animations_for_test(false);
-
scoped_ptr<Window> w1(
CreateTestWindowWithBounds(gfx::Rect(0, 0, 100, 100), NULL));
@@ -969,7 +966,7 @@ TEST_F(WindowTest, SetBoundsInternalShouldCheckTargetBounds) {
// Confirm that the target bounds are reached.
base::TimeTicks start_time =
- w1->layer()->GetAnimator()->last_step_time();
+ w1->layer()->GetAnimator()->get_last_step_time_for_test();
element->Step(start_time + base::TimeDelta::FromMilliseconds(1000));