Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(507)

Unified Diff: ui/aura/window_unittest.cc

Issue 9222018: reland -- Disable animations during aura tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/aura/window_unittest.cc
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index 5bb0bbd11f8ec46a8175a053d03a8a3ffee7d29d..613c3ac66f7e02727010a9ad17dc211ceb52bdd6 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -932,6 +932,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));
@@ -965,7 +968,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));

Powered by Google App Engine
This is Rietveld 408576698