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 fa4435b9a8f95eccf16ba1a756ba938baf96c5a3..0a6118b36deeab3601016d5061fc1d86910cb702 100644
--- a/components/exo/pointer_unittest.cc
+++ b/components/exo/pointer_unittest.cc
@@ -37,7 +37,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());
 };
@@ -245,7 +244,7 @@ TEST_F(PointerTest, OnPointerScroll) {
 
   EXPECT_CALL(delegate, CanAcceptPointerEventsForSurface(surface.get()))
       .WillRepeatedly(testing::Return(true));
-  EXPECT_CALL(delegate, OnPointerFrame()).Times(4);
+  EXPECT_CALL(delegate, OnPointerFrame()).Times(3);
 
   EXPECT_CALL(delegate, OnPointerEnter(surface.get(), gfx::PointF(), 0));
   generator.MoveMouseTo(location);
@@ -254,7 +253,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::_));
@@ -352,7 +350,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::_));
@@ -393,7 +390,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);
@@ -435,7 +431,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::_));