reland -- Disable animations during aura tests.

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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 915 matching lines @@
   EXPECT_EQ(NULL, w->GetProperty("foo"));
   EXPECT_EQ(0, w->GetIntProperty("foo"));
 
   // Set NULL and make sure the property is gone.
   w->SetProperty(key, NULL);
   EXPECT_EQ(NULL, w->GetProperty(key));
   EXPECT_EQ(0, w->GetIntProperty(key));
 }
 
 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));
 
   EXPECT_FALSE(!w1->layer());
   w1->layer()->GetAnimator()->set_disable_timer_for_test(true);
   ui::AnimationContainerElement* element = w1->layer()->GetAnimator();
 
   EXPECT_EQ("0,0 100x100", w1->bounds().ToString());
   EXPECT_EQ("0,0 100x100", w1->layer()->GetTargetBounds().ToString());
 
@@ skipping 13 matching lines @@
   {
     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()->get_last_step_time_for_test();
+      w1->layer()->GetAnimator()->last_step_time();
 
   element->Step(start_time + base::TimeDelta::FromMilliseconds(1000));
 
   EXPECT_EQ("0,0 100x100", w1->bounds().ToString());
 }
 
 
 class WindowObserverTest : public WindowTest,
                            public WindowObserver {
  public:
@@ skipping 574 matching lines @@
 
   w1.reset();  // Deletes w11 and w111.
   w11 = NULL;
   w111 = NULL;
   EXPECT_EQ(2, observer.added_count());
   EXPECT_EQ(2, observer.removed_count());
 }
 
 }  // namespace test
 }  // namespace aura