| 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 4ffb0b27b4f201f3734f8403c5177855e548e1f3..3f01c54a174ce0bcfc5434de699b2ce1bf1c7b17 100644
|
| --- a/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc
|
| +++ b/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc
|
| @@ -22,14 +22,12 @@ class ScrollbarAnimationControllerLinearFadeTest
|
| ScrollbarAnimationControllerLinearFadeTest()
|
| : host_impl_(&proxy_, &shared_bitmap_manager_), needs_frame_count_(0) {}
|
|
|
| - virtual void PostDelayedScrollbarFade(const base::Closure& start_fade,
|
| - base::TimeDelta delay) override {
|
| + void PostDelayedScrollbarFade(const base::Closure& start_fade,
|
| + base::TimeDelta delay) override {
|
| start_fade_ = start_fade;
|
| delay_ = delay;
|
| }
|
| - virtual void SetNeedsScrollbarAnimationFrame() override {
|
| - needs_frame_count_++;
|
| - }
|
| + void SetNeedsScrollbarAnimationFrame() override { needs_frame_count_++; }
|
|
|
| protected:
|
| virtual void SetUp() {
|
| @@ -83,7 +81,7 @@ class ScrollbarAnimationControllerLinearFadeTest
|
| class VerticalScrollbarAnimationControllerLinearFadeTest
|
| : public ScrollbarAnimationControllerLinearFadeTest {
|
| protected:
|
| - virtual ScrollbarOrientation orientation() const override { return VERTICAL; }
|
| + ScrollbarOrientation orientation() const override { return VERTICAL; }
|
| };
|
|
|
| TEST_F(ScrollbarAnimationControllerLinearFadeTest, DelayAnimationOnResize) {
|
|
|