exo: Replace fling cancel with generic zero distance scroll

components/exo/pointer_unittest.cc

Index: components/exo/pointer_unittest.cc
diff --git a/components/exo/pointer_unittest.cc b/components/exo/pointer_unittest.cc
index a6ecd0f6cd44291d9cfd6e99bc71ddea7349755b..c94979cc599ec847cfbc2877acc86fc337bd29fa 100644
--- a/components/exo/pointer_unittest.cc
+++ b/components/exo/pointer_unittest.cc
@@ -36,7 +36,6 @@ class MockPointerDelegate : public PointerDelegate {
   MOCK_METHOD3(OnPointerButton, void(base::TimeTicks, int, bool));
   MOCK_METHOD3(OnPointerScroll,
                void(base::TimeTicks, const gfx::Vector2dF&, bool));
-  MOCK_METHOD1(OnPointerScrollCancel, void(base::TimeTicks));
   MOCK_METHOD1(OnPointerScrollStop, void(base::TimeTicks));
   MOCK_METHOD0(OnPointerFrame, void());
 };
@@ -253,7 +252,6 @@ TEST_F(PointerTest, OnPointerScroll) {
     // Expect fling stop followed by scroll and scroll stop.
     testing::InSequence sequence;
 
-    EXPECT_CALL(delegate, OnPointerScrollCancel(testing::_));
     EXPECT_CALL(delegate,
                 OnPointerScroll(testing::_, gfx::Vector2dF(1.2, 1.2), false));
     EXPECT_CALL(delegate, OnPointerScrollStop(testing::_));
@@ -350,7 +348,6 @@ TEST_F(PointerTest, IgnorePointerEventDuringModal) {
 
   {
     testing::InSequence sequence;
-    EXPECT_CALL(delegate, OnPointerScrollCancel(testing::_));
     EXPECT_CALL(delegate,
                 OnPointerScroll(testing::_, gfx::Vector2dF(1.2, 1.2), false));
     EXPECT_CALL(delegate, OnPointerScrollStop(testing::_));
@@ -391,7 +388,6 @@ TEST_F(PointerTest, IgnorePointerEventDuringModal) {
 
   {
     testing::InSequence sequence;
-    EXPECT_CALL(delegate, OnPointerScrollCancel(testing::_)).Times(0);
     EXPECT_CALL(delegate,
                 OnPointerScroll(testing::_, gfx::Vector2dF(1.2, 1.2), false))
         .Times(0);
@@ -433,7 +429,6 @@ TEST_F(PointerTest, IgnorePointerEventDuringModal) {
 
   {
     testing::InSequence sequence;
-    EXPECT_CALL(delegate, OnPointerScrollCancel(testing::_));
     EXPECT_CALL(delegate,
                 OnPointerScroll(testing::_, gfx::Vector2dF(1.2, 1.2), false));
     EXPECT_CALL(delegate, OnPointerScrollStop(testing::_));