| Index: cc/trees/layer_tree_host_impl_unittest.cc
|
| diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
|
| index 7776f3a2b216179fcf99f5eee9a5331478657f1b..a15cc79f76e00e502f374bd3ee829b01961f2517 100644
|
| --- a/cc/trees/layer_tree_host_impl_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_impl_unittest.cc
|
| @@ -10522,7 +10522,7 @@ TEST_F(LayerTreeHostImplTimelinesTest, ScrollAnimatedAborted) {
|
|
|
| // The instant scroll should have marked the smooth scroll animation as
|
| // aborted.
|
| - EXPECT_FALSE(GetImplAnimationHost()->HasActiveAnimationForTesting(
|
| + EXPECT_FALSE(GetImplAnimationHost()->HasTickingAnimationForTesting(
|
| scrolling_layer->element_id()));
|
|
|
| EXPECT_VECTOR2DF_EQ(gfx::ScrollOffset(0, y + 50),
|
| @@ -10581,7 +10581,7 @@ TEST_F(LayerTreeHostImplTimelinesTest,
|
|
|
| // Aborting with the needs completion param should have marked the smooth
|
| // scroll animation as finished.
|
| - EXPECT_FALSE(GetImplAnimationHost()->HasActiveAnimationForTesting(
|
| + EXPECT_FALSE(GetImplAnimationHost()->HasTickingAnimationForTesting(
|
| scrolling_layer->element_id()));
|
| EXPECT_TRUE(y > 1 && y < 49);
|
| EXPECT_EQ(NULL, host_impl_->CurrentlyScrollingLayer());
|
|
|