Index: cc/animation/scrollbar_animation_controller_thinning_unittest.cc |
diff --git a/cc/animation/scrollbar_animation_controller_thinning_unittest.cc b/cc/animation/scrollbar_animation_controller_thinning_unittest.cc |
index 2b53fdc77af73b57c9ed74362c58e0aa02dbf2ee..cb7d33e274d874b45b4d2a61ce16efee47849d06 100644 |
--- a/cc/animation/scrollbar_animation_controller_thinning_unittest.cc |
+++ b/cc/animation/scrollbar_animation_controller_thinning_unittest.cc |
@@ -58,6 +58,7 @@ class ScrollbarAnimationControllerThinningTest |
scroll_layer_ptr, |
this, |
base::TimeDelta::FromSeconds(2), |
+ base::TimeDelta::FromSeconds(5), |
base::TimeDelta::FromSeconds(3)); |
} |
@@ -83,7 +84,7 @@ TEST_F(ScrollbarAnimationControllerThinningTest, Idle) { |
TEST_F(ScrollbarAnimationControllerThinningTest, AwakenByProgrammaticScroll) { |
base::TimeTicks time; |
time += base::TimeDelta::FromSeconds(1); |
- scrollbar_controller_->DidScrollUpdate(); |
+ scrollbar_controller_->DidScrollUpdate(false); |
EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->opacity()); |
// Scrollbar doesn't change size if triggered by scroll. |
EXPECT_FLOAT_EQ(0.4f, scrollbar_layer_->thumb_thickness_scale_factor()); |
@@ -96,7 +97,7 @@ TEST_F(ScrollbarAnimationControllerThinningTest, AwakenByProgrammaticScroll) { |
EXPECT_FLOAT_EQ(0.4f, scrollbar_layer_->thumb_thickness_scale_factor()); |
// Subsequent scroll restarts animation. |
- scrollbar_controller_->DidScrollUpdate(); |
+ scrollbar_controller_->DidScrollUpdate(false); |
start_fade_.Run(); |
@@ -134,7 +135,7 @@ TEST_F(ScrollbarAnimationControllerThinningTest, ScrollWithMouseNear) { |
scrollbar_controller_->Animate(time); |
EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->thumb_thickness_scale_factor()); |
- scrollbar_controller_->DidScrollUpdate(); |
+ scrollbar_controller_->DidScrollUpdate(false); |
start_fade_.Run(); |
scrollbar_controller_->Animate(time); |
EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->opacity()); |