Scrollbar fade animation broken on Android regression resolved.

cc/input/scrollbar_animation_controller.h

Index: cc/input/scrollbar_animation_controller.h
diff --git a/cc/input/scrollbar_animation_controller.h b/cc/input/scrollbar_animation_controller.h
index d1f3787c1aa45d1b9c6b34e959c828ff7ae5f6d3..27af5d643995cc9795f2b11725fbad14e4fdf7da 100644
--- a/cc/input/scrollbar_animation_controller.h
+++ b/cc/input/scrollbar_animation_controller.h
@@ -46,6 +46,9 @@ class CC_EXPORT ScrollbarAnimationController {
   virtual void DidMouseMoveOffScrollbar() {}
   virtual void DidMouseMoveNear(float distance) {}
 
+  // Used for testing.
+  bool currently_scrolling() { return currently_scrolling_; }
+
  protected:
   ScrollbarAnimationController(int scroll_layer_id,
                                ScrollbarAnimationControllerClient* client,