Index: cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc |
diff --git a/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc b/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc |
index e5801d6c6aff86ddf100f3be46515438b862bad1..5271c110fe0fb67dba98d9b446c6026fcc509477 100644 |
--- a/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc |
+++ b/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc |
@@ -59,6 +59,7 @@ class ScrollbarAnimationControllerLinearFadeTest |
scroll_layer_ptr, |
this, |
base::TimeDelta::FromSeconds(2), |
+ base::TimeDelta::FromSeconds(5), |
base::TimeDelta::FromSeconds(3)); |
} |
@@ -105,7 +106,7 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, AwakenByScrollingGesture) { |
time += base::TimeDelta::FromSeconds(1); |
scrollbar_controller_->DidScrollBegin(); |
- scrollbar_controller_->DidScrollUpdate(); |
+ scrollbar_controller_->DidScrollUpdate(false); |
EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->opacity()); |
EXPECT_TRUE(start_fade_.Equals(base::Closure())); |
@@ -131,7 +132,7 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, AwakenByScrollingGesture) { |
time += base::TimeDelta::FromSeconds(1); |
scrollbar_controller_->DidScrollBegin(); |
- scrollbar_controller_->DidScrollUpdate(); |
+ scrollbar_controller_->DidScrollUpdate(false); |
scrollbar_controller_->DidScrollEnd(); |
start_fade_.Run(); |
@@ -157,7 +158,7 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, AwakenByScrollingGesture) { |
TEST_F(ScrollbarAnimationControllerLinearFadeTest, AwakenByProgrammaticScroll) { |
base::TimeTicks time; |
time += base::TimeDelta::FromSeconds(1); |
- scrollbar_controller_->DidScrollUpdate(); |
+ scrollbar_controller_->DidScrollUpdate(false); |
start_fade_.Run(); |
scrollbar_controller_->Animate(time); |
EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->opacity()); |
@@ -165,7 +166,7 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, AwakenByProgrammaticScroll) { |
time += base::TimeDelta::FromSeconds(1); |
scrollbar_controller_->Animate(time); |
EXPECT_FLOAT_EQ(2.0f / 3.0f, scrollbar_layer_->opacity()); |
- scrollbar_controller_->DidScrollUpdate(); |
+ scrollbar_controller_->DidScrollUpdate(false); |
start_fade_.Run(); |
time += base::TimeDelta::FromSeconds(1); |
@@ -181,7 +182,7 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, AwakenByProgrammaticScroll) { |
EXPECT_FLOAT_EQ(1.0f / 3.0f, scrollbar_layer_->opacity()); |
time += base::TimeDelta::FromSeconds(1); |
- scrollbar_controller_->DidScrollUpdate(); |
+ scrollbar_controller_->DidScrollUpdate(false); |
start_fade_.Run(); |
time += base::TimeDelta::FromSeconds(1); |
scrollbar_controller_->Animate(time); |
@@ -206,7 +207,7 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, |
AnimationPreservedByNonScrollingGesture) { |
base::TimeTicks time; |
time += base::TimeDelta::FromSeconds(1); |
- scrollbar_controller_->DidScrollUpdate(); |
+ scrollbar_controller_->DidScrollUpdate(false); |
start_fade_.Run(); |
scrollbar_controller_->Animate(time); |
EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->opacity()); |
@@ -238,7 +239,7 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, |
AnimationOverriddenByScrollingGesture) { |
base::TimeTicks time; |
time += base::TimeDelta::FromSeconds(1); |
- scrollbar_controller_->DidScrollUpdate(); |
+ scrollbar_controller_->DidScrollUpdate(false); |
start_fade_.Run(); |
scrollbar_controller_->Animate(time); |
EXPECT_FLOAT_EQ(1.0f, scrollbar_layer_->opacity()); |
@@ -255,7 +256,7 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, |
EXPECT_FLOAT_EQ(1.0f / 3.0f, scrollbar_layer_->opacity()); |
time += base::TimeDelta::FromSeconds(1); |
- scrollbar_controller_->DidScrollUpdate(); |
+ scrollbar_controller_->DidScrollUpdate(false); |
EXPECT_FLOAT_EQ(1, scrollbar_layer_->opacity()); |
time += base::TimeDelta::FromSeconds(1); |