exo: Replace fling cancel with generic zero distance scroll

components/exo/pointer_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/exo/pointer.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/wm/window_positioning_utils.h"
@@ skipping 19 matching lines @@
 
   // Overridden from PointerDelegate:
   MOCK_METHOD1(OnPointerDestroying, void(Pointer*));
   MOCK_CONST_METHOD1(CanAcceptPointerEventsForSurface, bool(Surface*));
   MOCK_METHOD3(OnPointerEnter, void(Surface*, const gfx::PointF&, int));
   MOCK_METHOD1(OnPointerLeave, void(Surface*));
   MOCK_METHOD2(OnPointerMotion, void(base::TimeTicks, const gfx::PointF&));
   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());
 };
 
 TEST_F(PointerTest, SetCursor) {
   std::unique_ptr<Surface> surface(new Surface);
   std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
   gfx::Size buffer_size(10, 10);
   std::unique_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
@@ skipping 187 matching lines @@
   surface->Attach(buffer.get());
   surface->Commit();
 
   MockPointerDelegate delegate;
   std::unique_ptr<Pointer> pointer(new Pointer(&delegate));
   ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow());
   gfx::Point location = surface->window()->GetBoundsInScreen().origin();
 
   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);
 
   {
     // 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::_));
   }
   generator.ScrollSequence(location, base::TimeDelta(), 1, 1, 1, 1);
 
   EXPECT_CALL(delegate, OnPointerDestroying(pointer.get()));
   pointer.reset();
 }
 
@@ skipping 77 matching lines @@
     testing::InSequence sequence;
     EXPECT_CALL(delegate,
                 OnPointerButton(testing::_, ui::EF_LEFT_MOUSE_BUTTON, true));
     EXPECT_CALL(delegate,
                 OnPointerButton(testing::_, ui::EF_LEFT_MOUSE_BUTTON, false));
   }
   generator.ClickLeftButton();
 
   {
     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::_));
   }
   generator.ScrollSequence(location2, base::TimeDelta(), 1, 1, 1, 1);
 
   {
     testing::InSequence sequence;
     EXPECT_CALL(delegate, OnPointerLeave(surface2.get()));
   }
@@ skipping 20 matching lines @@
                 OnPointerButton(testing::_, ui::EF_LEFT_MOUSE_BUTTON, true))
         .Times(0);
     EXPECT_CALL(delegate,
                 OnPointerButton(testing::_, ui::EF_LEFT_MOUSE_BUTTON, false))
         .Times(0);
   }
   generator.ClickLeftButton();
 
   {
     testing::InSequence sequence;
-    EXPECT_CALL(delegate, OnPointerScrollCancel(testing::_)).Times(0);
     EXPECT_CALL(delegate,
                 OnPointerScroll(testing::_, gfx::Vector2dF(1.2, 1.2), false))
         .Times(0);
     EXPECT_CALL(delegate, OnPointerScrollStop(testing::_)).Times(0);
   }
   generator.ScrollSequence(location, base::TimeDelta(), 1, 1, 1, 1);
 
   {
     testing::InSequence sequence;
     EXPECT_CALL(delegate, OnPointerLeave(surface.get())).Times(0);
@@ skipping 21 matching lines @@
     testing::InSequence sequence;
     EXPECT_CALL(delegate,
                 OnPointerButton(testing::_, ui::EF_LEFT_MOUSE_BUTTON, true));
     EXPECT_CALL(delegate,
                 OnPointerButton(testing::_, ui::EF_LEFT_MOUSE_BUTTON, false));
   }
   generator.ClickLeftButton();
 
   {
     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::_));
   }
   generator.ScrollSequence(location, base::TimeDelta(), 1, 1, 1, 1);
 
   {
     testing::InSequence sequence;
     EXPECT_CALL(delegate, OnPointerLeave(surface.get()));
   }
   generator.MoveMouseTo(surface->window()->GetBoundsInScreen().bottom_right());
 
   EXPECT_CALL(delegate, OnPointerDestroying(pointer.get()));
   pointer.reset();
 }
 
 }  // namespace
 }  // namespace exo