reland -- Disable animations during aura tests.

ui/aura/window_unittest.cc

Index: ui/aura/window_unittest.cc
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index a5bd458ec647f78b90d5068c02418bbe5166337a..47a7702ef5d6e6e73cd6ecb93542ea42f950efcc 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -886,6 +886,9 @@ 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));
 
@@ -919,7 +922,7 @@ TEST_F(WindowTest, SetBoundsInternalShouldCheckTargetBounds) {
 
   // Confirm that the target bounds are reached.
   base::TimeTicks start_time =
-      w1->layer()->GetAnimator()->get_last_step_time_for_test();
+      w1->layer()->GetAnimator()->last_step_time();
 
   element->Step(start_time + base::TimeDelta::FromMilliseconds(1000));