Refactor TouchSelectionDraggableClient APIs

ui/touch_selection/longpress_drag_selector_unittest.cc

 // Copyright 2014 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 "ui/touch_selection/longpress_drag_selector.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/test/motion_event_test_utils.h"
 
 using ui::test::MockMotionEvent;
@@ skipping 21 matching lines @@
   bool GetAndResetActiveStateChanged() {
     bool active_state_changed = active_state_changed_;
     active_state_changed_ = false;
     return active_state_changed;
   }
 
   bool IsDragging() const { return dragging_; }
   const gfx::PointF& DragPosition() const { return drag_position_; }
 
   // LongPressDragSelectorClient implementation.
-  void OnDragBegin(const TouchSelectionDraggable& handler,
-                   const gfx::PointF& drag_position) override {
-    dragging_ = true;
-    drag_position_ = drag_position;
-  }
-
-  void OnDragUpdate(const TouchSelectionDraggable& handler,
-                    const gfx::PointF& drag_position) override {
-    drag_position_ = drag_position;
-  }
-
-  void OnDragEnd(const TouchSelectionDraggable& handler) override {
-    dragging_ = false;
+  void OnDragEvent(const TouchHandleDragEvent event,
+                   const TouchSelectionDraggable& draggable,
+                   const gfx::PointF& position) override {
+    switch (event) {
+      case HANDLE_DRAG_BEGIN:
+        dragging_ = true;
+        drag_position_ = position;
+        break;
+      case HANDLE_DRAG_UPDATE:
+        drag_position_ = position;
+        break;
+      case HANDLE_DRAG_END:
+        dragging_ = false;
+      default:
+        NOTREACHED() << "Invalid handle drag event";
+    }
   }
 
   bool IsWithinTapSlop(const gfx::Vector2dF& delta) const override {
     return delta.LengthSquared() < (kSlop * kSlop);
   }
 
   void OnLongPressDragActiveStateChanged() override {
     active_state_changed_ = true;
   }
 
@@ skipping 293 matching lines @@
   EXPECT_TRUE(IsDragging());
   EXPECT_EQ(selection_end, DragPosition());
 
   // Release the touch sequence, ending the drag.
   EXPECT_FALSE(selector.WillHandleTouchEvent(event.ReleasePoint()));
   EXPECT_FALSE(IsDragging());
   EXPECT_TRUE(GetAndResetActiveStateChanged());
 }
 
 }  // namespace ui