Revert 120092 - Reland 120074 -- Disable animations during aura tests.

ui/aura/window_unittest.cc

Index: ui/aura/window_unittest.cc
===================================================================
--- ui/aura/window_unittest.cc	(revision 120096)
+++ ui/aura/window_unittest.cc	(working copy)
@@ -933,9 +933,6 @@
 }
 
 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 @@
 
   // 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));