Add INSERTION_DRAG_STOPPED to SelectionEventType

ui/touch_selection/touch_selection_controller_unittest.cc

Index: ui/touch_selection/touch_selection_controller_unittest.cc
diff --git a/ui/touch_selection/touch_selection_controller_unittest.cc b/ui/touch_selection/touch_selection_controller_unittest.cc
index b10c1daaee2c66f657e7f6a478d0e7b393e532f4..c8eddb3a3e0d38fa847a651d4d8dd84033097455 100644
--- a/ui/touch_selection/touch_selection_controller_unittest.cc
+++ b/ui/touch_selection/touch_selection_controller_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "ui/touch_selection/touch_selection_controller.h"
 
+#include <map>
+
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/test/motion_event_test_utils.h"
 
@@ -39,7 +41,7 @@ class TouchSelectionControllerTest : public testing::Test,
                                      public TouchSelectionControllerClient {
  public:
   TouchSelectionControllerTest()
-      : last_event_(SELECTION_CLEARED),
+      : total_event_count_(0),
         caret_moved_(false),
         selection_moved_(false),
         selection_points_swapped_(false),
@@ -92,7 +94,8 @@ class TouchSelectionControllerTest : public testing::Test,
 
   void OnSelectionEvent(SelectionEventType event,
                         const gfx::PointF& end_position) override {
-    last_event_ = event;
+    event_count_[event]++;
+    total_event_count_++;
     last_event_start_ = end_position;
   }
 
@@ -177,9 +180,17 @@ class TouchSelectionControllerTest : public testing::Test,
   const gfx::PointF& GetLastCaretPosition() const { return caret_position_; }
   const gfx::PointF& GetLastSelectionStart() const { return selection_start_; }
   const gfx::PointF& GetLastSelectionEnd() const { return selection_end_; }
-  SelectionEventType GetLastEventType() const { return last_event_; }
   const gfx::PointF& GetLastEventAnchor() const { return last_event_start_; }
 
+  int total_event_count() const { return total_event_count_; }
+
+  int GetAndResetEventCount(SelectionEventType event) {
+    int count = event_count_[event];
+    event_count_.erase(event);
+    total_event_count_ -= count;
+    return count;
+  }
+
   TouchSelectionController& controller() { return *controller_; }
 
  private:
@@ -187,7 +198,8 @@ class TouchSelectionControllerTest : public testing::Test,
   gfx::PointF caret_position_;
   gfx::PointF selection_start_;
   gfx::PointF selection_end_;
-  SelectionEventType last_event_;
+  int total_event_count_;
+  std::map<SelectionEventType, int> event_count_;
   bool caret_moved_;
   bool selection_moved_;
   bool selection_points_swapped_;
@@ -203,31 +215,37 @@ TEST_F(TouchSelectionControllerTest, InsertionBasic) {
 
   // Insertion events are ignored until automatic showing is enabled.
   ChangeInsertion(insertion_rect, visible);
+  EXPECT_EQ(0, total_event_count());
   EXPECT_EQ(gfx::PointF(), GetLastEventAnchor());
   controller().OnTapEvent();
 
   // Insertion events are ignored until the selection region is marked editable.
   ChangeInsertion(insertion_rect, visible);
+  EXPECT_EQ(0, total_event_count());
   EXPECT_EQ(gfx::PointF(), GetLastEventAnchor());
 
   controller().OnTapEvent();
   controller().OnSelectionEditable(true);
   ChangeInsertion(insertion_rect, visible);
-  EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_SHOWN));
   EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
 
   insertion_rect.Offset(1, 0);
   ChangeInsertion(insertion_rect, visible);
-  EXPECT_EQ(INSERTION_MOVED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_MOVED));
   EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
 
   insertion_rect.Offset(0, 1);
   ChangeInsertion(insertion_rect, visible);
-  EXPECT_EQ(INSERTION_MOVED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_MOVED));
   EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
 
   ClearInsertion();
-  EXPECT_EQ(INSERTION_CLEARED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_CLEARED));
 }
 
 TEST_F(TouchSelectionControllerTest, InsertionClearedWhenNoLongerEditable) {
@@ -237,11 +255,13 @@ TEST_F(TouchSelectionControllerTest, InsertionClearedWhenNoLongerEditable) {
   controller().OnSelectionEditable(true);
 
   ChangeInsertion(insertion_rect, visible);
-  EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_SHOWN));
   EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
 
   controller().OnSelectionEditable(false);
-  EXPECT_EQ(INSERTION_CLEARED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_CLEARED));
 }
 
 TEST_F(TouchSelectionControllerTest, InsertionWithNoShowOnTapForEmptyEditable) {
@@ -260,24 +280,28 @@ TEST_F(TouchSelectionControllerTest, InsertionWithNoShowOnTapForEmptyEditable) {
   controller().OnTapEvent();
   controller().OnSelectionEmpty(false);
   ChangeInsertion(insertion_rect, visible);
-  EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_SHOWN));
   EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
 
   // Reset the selection.
   controller().HideAndDisallowShowingAutomatically();
-  EXPECT_EQ(INSERTION_CLEARED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_CLEARED));
 
   // Long-pressing should show the handle even if the editable region is empty.
   insertion_rect.Offset(2, -2);
   controller().OnLongPressEvent();
   controller().OnSelectionEmpty(true);
   ChangeInsertion(insertion_rect, visible);
-  EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_SHOWN));
   EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
 
   // Single Tap on an empty edit field should clear insertion handle.
   controller().OnTapEvent();
-  EXPECT_EQ(INSERTION_CLEARED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_CLEARED));
 }
 
 TEST_F(TouchSelectionControllerTest, InsertionWithShowOnTapForEmptyEditable) {
@@ -292,7 +316,8 @@ TEST_F(TouchSelectionControllerTest, InsertionWithShowOnTapForEmptyEditable) {
   controller().OnTapEvent();
   controller().OnSelectionEmpty(true);
   ChangeInsertion(insertion_rect, visible);
-  EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_SHOWN));
   EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
 }
 
@@ -317,7 +342,8 @@ TEST_F(TouchSelectionControllerTest, InsertionAppearsAfterTapFollowingTyping) {
   // entry, the handle should appear.
   controller().OnTapEvent();
   ChangeInsertion(insertion_rect, visible);
-  EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_SHOWN));
   EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
 }
 
@@ -330,23 +356,30 @@ TEST_F(TouchSelectionControllerTest, InsertionToSelectionTransition) {
   bool visible = true;
 
   ChangeInsertion(start_rect, visible);
-  EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_SHOWN));
   EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
 
   ChangeSelection(start_rect, visible, end_rect, visible);
-  EXPECT_EQ(SELECTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(2, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_CLEARED));
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_SHOWN));
   EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
 
   ChangeInsertion(end_rect, visible);
-  EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(2, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_CLEARED));
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_SHOWN));
   EXPECT_EQ(end_rect.bottom_left(), GetLastEventAnchor());
 
   controller().HideAndDisallowShowingAutomatically();
-  EXPECT_EQ(INSERTION_CLEARED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_CLEARED));
 
   controller().OnTapEvent();
   ChangeInsertion(end_rect, visible);
-  EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_SHOWN));
   EXPECT_EQ(end_rect.bottom_left(), GetLastEventAnchor());
 }
 
@@ -363,7 +396,8 @@ TEST_F(TouchSelectionControllerTest, InsertionDragged) {
   gfx::RectF start_rect(10, 0, 0, line_height);
   bool visible = true;
   ChangeInsertion(start_rect, visible);
-  EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_SHOWN));
   EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
 
   // The touch sequence should be handled only if the drawable reports a hit.
@@ -371,6 +405,8 @@ TEST_F(TouchSelectionControllerTest, InsertionDragged) {
   SetDraggingEnabled(true);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
   EXPECT_FALSE(GetAndResetCaretMoved());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_DRAG_STARTED));
 
   // The MoveCaret() result should reflect the movement.
   // The reported position is offset from the center of |start_rect|.
@@ -393,6 +429,8 @@ TEST_F(TouchSelectionControllerTest, InsertionDragged) {
   event = MockMotionEvent(MockMotionEvent::ACTION_UP, event_time, 10, 5);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
   EXPECT_FALSE(GetAndResetCaretMoved());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_DRAG_STOPPED));
 
   // Once the drag is complete, no more touch events should be consumed until
   // the next ACTION_DOWN.
@@ -408,22 +446,28 @@ TEST_F(TouchSelectionControllerTest, InsertionTapped) {
   gfx::RectF start_rect(10, 0, 0, 10);
   bool visible = true;
   ChangeInsertion(start_rect, visible);
-  EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_SHOWN));
 
   MockMotionEvent event(MockMotionEvent::ACTION_DOWN, event_time, 0, 0);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
   //TODO(AKV): this test case has to be modified once crbug.com/394093 is fixed.
-  EXPECT_EQ(INSERTION_DRAG_STARTED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_DRAG_STARTED));
 
   event = MockMotionEvent(MockMotionEvent::ACTION_UP, event_time, 0, 0);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_EQ(INSERTION_TAPPED, GetLastEventType());
+  EXPECT_EQ(2, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_DRAG_STOPPED));
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_TAPPED));
 
   // Reset the insertion.
   ClearInsertion();
   controller().OnTapEvent();
   ChangeInsertion(start_rect, visible);
-  ASSERT_EQ(INSERTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(2, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_CLEARED));
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_SHOWN));
 
   // No tap should be signalled if the time between DOWN and UP was too long.
   event = MockMotionEvent(MockMotionEvent::ACTION_DOWN, event_time, 0, 0);
@@ -433,13 +477,17 @@ TEST_F(TouchSelectionControllerTest, InsertionTapped) {
                           0,
                           0);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_EQ(INSERTION_DRAG_STARTED, GetLastEventType());
+  EXPECT_EQ(2, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_DRAG_STARTED));
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_DRAG_STOPPED));
 
   // Reset the insertion.
   ClearInsertion();
   controller().OnTapEvent();
   ChangeInsertion(start_rect, visible);
-  ASSERT_EQ(INSERTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(2, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_CLEARED));
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_SHOWN));
 
   // No tap should be signalled if the drag was too long.
   event = MockMotionEvent(MockMotionEvent::ACTION_DOWN, event_time, 0, 0);
@@ -448,20 +496,26 @@ TEST_F(TouchSelectionControllerTest, InsertionTapped) {
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
   event = MockMotionEvent(MockMotionEvent::ACTION_UP, event_time, 100, 0);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_EQ(INSERTION_DRAG_STARTED, GetLastEventType());
+  EXPECT_EQ(2, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_DRAG_STARTED));
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_DRAG_STOPPED));
 
   // Reset the insertion.
   ClearInsertion();
   controller().OnTapEvent();
   ChangeInsertion(start_rect, visible);
-  ASSERT_EQ(INSERTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(2, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_CLEARED));
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_SHOWN));
 
   // No tap should be signalled if the touch sequence is cancelled.
   event = MockMotionEvent(MockMotionEvent::ACTION_DOWN, event_time, 0, 0);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
   event = MockMotionEvent(MockMotionEvent::ACTION_CANCEL, event_time, 0, 0);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_EQ(INSERTION_DRAG_STARTED, GetLastEventType());
+  EXPECT_EQ(2, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_DRAG_STARTED));
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_DRAG_STOPPED));
 }
 
 TEST_F(TouchSelectionControllerTest, InsertionNotResetByRepeatedTapOrPress) {
@@ -473,24 +527,29 @@ TEST_F(TouchSelectionControllerTest, InsertionNotResetByRepeatedTapOrPress) {
   gfx::RectF anchor_rect(10, 0, 0, 10);
   bool visible = true;
   ChangeInsertion(anchor_rect, visible);
-  EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_SHOWN));
   EXPECT_EQ(anchor_rect.bottom_left(), GetLastEventAnchor());
 
   // Tapping again shouldn't reset the active insertion point.
   controller().OnTapEvent();
   MockMotionEvent event(MockMotionEvent::ACTION_DOWN, event_time, 0, 0);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_EQ(INSERTION_DRAG_STARTED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_DRAG_STARTED));
   EXPECT_EQ(anchor_rect.bottom_left(), GetLastEventAnchor());
 
   event = MockMotionEvent(MockMotionEvent::ACTION_UP, event_time, 0, 0);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_EQ(INSERTION_TAPPED, GetLastEventType());
+  EXPECT_EQ(2, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_TAPPED));
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_DRAG_STOPPED));
   EXPECT_EQ(anchor_rect.bottom_left(), GetLastEventAnchor());
 
   anchor_rect.Offset(5, 15);
   ChangeInsertion(anchor_rect, visible);
-  EXPECT_EQ(INSERTION_MOVED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_MOVED));
   EXPECT_EQ(anchor_rect.bottom_left(), GetLastEventAnchor());
 
   // Pressing shouldn't reset the active insertion point.
@@ -498,12 +557,15 @@ TEST_F(TouchSelectionControllerTest, InsertionNotResetByRepeatedTapOrPress) {
   controller().OnSelectionEmpty(true);
   event = MockMotionEvent(MockMotionEvent::ACTION_DOWN, event_time, 0, 0);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_EQ(INSERTION_DRAG_STARTED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_DRAG_STARTED));
   EXPECT_EQ(anchor_rect.bottom_left(), GetLastEventAnchor());
 
   event = MockMotionEvent(MockMotionEvent::ACTION_UP, event_time, 0, 0);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_EQ(INSERTION_TAPPED, GetLastEventType());
+  EXPECT_EQ(2, total_event_count());

[jdduke (slow), 2015/02/19 22:53:48]

This is still too much boiler plate. If we use Gmock (#include
"testing/gmock/include/gmock/gmock.h"), we can probably do something like:

EXPECT_THAT(PopEvents(), ElementsAre(A, B, ...));

Can you give that a try?

[mohsen, 2015/02/20 18:16:00]

Nice, I was looking for something like that. Please see how it looks now.

+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_TAPPED));
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_DRAG_STOPPED));
   EXPECT_EQ(anchor_rect.bottom_left(), GetLastEventAnchor());
 }
 
@@ -518,16 +580,18 @@ TEST_F(TouchSelectionControllerTest, SelectionBasic) {
 
   controller().OnLongPressEvent();
   ChangeSelection(start_rect, visible, end_rect, visible);
-  EXPECT_EQ(SELECTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_SHOWN));
   EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
 
   start_rect.Offset(1, 0);
   ChangeSelection(start_rect, visible, end_rect, visible);
   // Selection movement does not currently trigger a separate event.
-  EXPECT_EQ(SELECTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(0, total_event_count());
 
   ClearSelection();
-  EXPECT_EQ(SELECTION_CLEARED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_CLEARED));
   EXPECT_EQ(gfx::PointF(), GetLastEventAnchor());
 }
 
@@ -538,7 +602,8 @@ TEST_F(TouchSelectionControllerTest, SelectionRepeatedLongPress) {
 
   controller().OnLongPressEvent();
   ChangeSelection(start_rect, visible, end_rect, visible);
-  EXPECT_EQ(SELECTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_SHOWN));
   EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
 
   // A long press triggering a new selection should re-send the SELECTION_SHOWN
@@ -546,7 +611,8 @@ TEST_F(TouchSelectionControllerTest, SelectionRepeatedLongPress) {
   start_rect.Offset(10, 10);
   controller().OnLongPressEvent();
   ChangeSelection(start_rect, visible, end_rect, visible);
-  EXPECT_EQ(SELECTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_SHOWN));
   EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
 }
 
@@ -563,7 +629,8 @@ TEST_F(TouchSelectionControllerTest, SelectionDragged) {
   gfx::RectF end_rect(50, 0, 0, line_height);
   bool visible = true;
   ChangeSelection(start_rect, visible, end_rect, visible);
-  EXPECT_EQ(SELECTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_SHOWN));
   EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
 
   // The touch sequence should be handled only if the drawable reports a hit.
@@ -581,7 +648,8 @@ TEST_F(TouchSelectionControllerTest, SelectionDragged) {
   gfx::PointF start_offset = start_rect.CenterPoint();
   event = MockMotionEvent(MockMotionEvent::ACTION_MOVE, event_time, 0, 5);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_EQ(SELECTION_DRAG_STARTED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_DRAG_STARTED));
   EXPECT_TRUE(GetAndResetSelectionMoved());
   EXPECT_EQ(fixed_offset, GetLastSelectionStart());
   EXPECT_EQ(start_offset + gfx::Vector2dF(0, 5), GetLastSelectionEnd());
@@ -600,7 +668,8 @@ TEST_F(TouchSelectionControllerTest, SelectionDragged) {
 
   event = MockMotionEvent(MockMotionEvent::ACTION_UP, event_time, 10, 5);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_EQ(SELECTION_DRAG_STOPPED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_DRAG_STOPPED));
   EXPECT_FALSE(GetAndResetSelectionMoved());
 
   // Once the drag is complete, no more touch events should be consumed until
@@ -617,7 +686,8 @@ TEST_F(TouchSelectionControllerTest, SelectionDraggedWithOverlap) {
   gfx::RectF end_rect(50, 0, 0, line_height);
   bool visible = true;
   ChangeSelection(start_rect, visible, end_rect, visible);
-  EXPECT_EQ(SELECTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_SHOWN));
   EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
 
   // The ACTION_DOWN should lock to the closest handle.
@@ -628,7 +698,8 @@ TEST_F(TouchSelectionControllerTest, SelectionDraggedWithOverlap) {
       MockMotionEvent::ACTION_DOWN, event_time, touch_down_x, 0);
   SetDraggingEnabled(true);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_EQ(SELECTION_DRAG_STARTED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_DRAG_STARTED));
   EXPECT_FALSE(GetAndResetSelectionMoved());
 
   // Even though the ACTION_MOVE is over the start handle, it should continue
@@ -642,7 +713,8 @@ TEST_F(TouchSelectionControllerTest, SelectionDraggedWithOverlap) {
 
   event = MockMotionEvent(MockMotionEvent::ACTION_UP, event_time, 0, 0);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_EQ(SELECTION_DRAG_STOPPED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_DRAG_STOPPED));
   EXPECT_FALSE(GetAndResetSelectionMoved());
 }
 
@@ -655,7 +727,8 @@ TEST_F(TouchSelectionControllerTest, SelectionDraggedToSwitchBaseAndExtent) {
   gfx::RectF end_rect(100, line_height, 0, line_height);
   bool visible = true;
   ChangeSelection(start_rect, visible, end_rect, visible);
-  EXPECT_EQ(SELECTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_SHOWN));
   EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
 
   SetDraggingEnabled(true);
@@ -672,7 +745,8 @@ TEST_F(TouchSelectionControllerTest, SelectionDraggedToSwitchBaseAndExtent) {
   event = MockMotionEvent(MockMotionEvent::ACTION_MOVE, event_time,
                           end_rect.x(), end_rect.bottom() + 5);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_EQ(SELECTION_DRAG_STARTED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_DRAG_STARTED));
   EXPECT_TRUE(GetAndResetSelectionMoved());
   EXPECT_FALSE(GetAndResetSelectionPointsSwapped());
   EXPECT_EQ(base_offset, GetLastSelectionStart());
@@ -680,7 +754,8 @@ TEST_F(TouchSelectionControllerTest, SelectionDraggedToSwitchBaseAndExtent) {
 
   event = MockMotionEvent(MockMotionEvent::ACTION_UP, event_time, 10, 5);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_EQ(SELECTION_DRAG_STOPPED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_DRAG_STOPPED));
   EXPECT_FALSE(GetAndResetSelectionMoved());
 
   end_rect += gfx::Vector2dF(0, 5);
@@ -698,7 +773,8 @@ TEST_F(TouchSelectionControllerTest, SelectionDraggedToSwitchBaseAndExtent) {
   event = MockMotionEvent(MockMotionEvent::ACTION_MOVE, event_time,
                           start_rect.x(), start_rect.bottom() + 5);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_EQ(SELECTION_DRAG_STARTED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_DRAG_STARTED));
   EXPECT_TRUE(GetAndResetSelectionMoved());
   EXPECT_FALSE(GetAndResetSelectionPointsSwapped());
   EXPECT_EQ(base_offset, GetLastSelectionStart());
@@ -706,7 +782,8 @@ TEST_F(TouchSelectionControllerTest, SelectionDraggedToSwitchBaseAndExtent) {
 
   event = MockMotionEvent(MockMotionEvent::ACTION_UP, event_time, 10, 5);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_EQ(SELECTION_DRAG_STOPPED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_DRAG_STOPPED));
   EXPECT_FALSE(GetAndResetSelectionMoved());
 
   start_rect += gfx::Vector2dF(0, 5);
@@ -724,7 +801,8 @@ TEST_F(TouchSelectionControllerTest, SelectionDraggedToSwitchBaseAndExtent) {
   event = MockMotionEvent(MockMotionEvent::ACTION_MOVE, event_time,
                           start_rect.x(), start_rect.bottom() + 5);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_EQ(SELECTION_DRAG_STARTED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_DRAG_STARTED));
   EXPECT_TRUE(GetAndResetSelectionMoved());
   EXPECT_FALSE(GetAndResetSelectionPointsSwapped());
   EXPECT_EQ(base_offset, GetLastSelectionStart());
@@ -732,7 +810,8 @@ TEST_F(TouchSelectionControllerTest, SelectionDraggedToSwitchBaseAndExtent) {
 
   event = MockMotionEvent(MockMotionEvent::ACTION_UP, event_time, 10, 5);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_EQ(SELECTION_DRAG_STOPPED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_DRAG_STOPPED));
   EXPECT_FALSE(GetAndResetSelectionMoved());
 
   start_rect += gfx::Vector2dF(0, 5);
@@ -750,7 +829,8 @@ TEST_F(TouchSelectionControllerTest, SelectionDraggedToSwitchBaseAndExtent) {
   event = MockMotionEvent(MockMotionEvent::ACTION_MOVE, event_time,
                           end_rect.x(), end_rect.bottom() + 5);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_EQ(SELECTION_DRAG_STARTED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_DRAG_STARTED));
   EXPECT_TRUE(GetAndResetSelectionMoved());
   EXPECT_FALSE(GetAndResetSelectionPointsSwapped());
   EXPECT_EQ(base_offset, GetLastSelectionStart());
@@ -758,7 +838,8 @@ TEST_F(TouchSelectionControllerTest, SelectionDraggedToSwitchBaseAndExtent) {
 
   event = MockMotionEvent(MockMotionEvent::ACTION_UP, event_time, 10, 5);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_EQ(SELECTION_DRAG_STOPPED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_DRAG_STOPPED));
   EXPECT_FALSE(GetAndResetSelectionMoved());
 }
 
@@ -772,7 +853,8 @@ TEST_F(TouchSelectionControllerTest, SelectionDragExtremeLineSize) {
   gfx::RectF large_line_rect(50, 50, 0, large_line_height);
   bool visible = true;
   ChangeSelection(small_line_rect, visible, large_line_rect, visible);
-  EXPECT_EQ(SELECTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_SHOWN));
   EXPECT_EQ(small_line_rect.bottom_left(), GetLastEventAnchor());
 
   // Start dragging the handle on the small line.
@@ -780,7 +862,8 @@ TEST_F(TouchSelectionControllerTest, SelectionDragExtremeLineSize) {
                         small_line_rect.x(), small_line_rect.y());
   SetDraggingEnabled(true);
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
-  EXPECT_EQ(SELECTION_DRAG_STARTED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_DRAG_STARTED));
   // The drag coordinate for large lines should be capped to a reasonable
   // offset, allowing seamless transition to neighboring lines with different
   // sizes. The drag coordinate for small lines should have an offset
@@ -859,15 +942,18 @@ TEST_F(TouchSelectionControllerTest, SelectionClearOnTap) {
 
   controller().OnLongPressEvent();
   ChangeSelection(start_rect, visible, end_rect, visible);
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_SHOWN));
 
   // Selection should not be cleared if the selection bounds have not changed.
   controller().OnTapEvent();
-  EXPECT_EQ(SELECTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(0, total_event_count());
   EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
 
   controller().OnTapEvent();
   ClearSelection();
-  EXPECT_EQ(SELECTION_CLEARED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_CLEARED));
   EXPECT_EQ(gfx::PointF(), GetLastEventAnchor());
 }
 
@@ -876,25 +962,27 @@ TEST_F(TouchSelectionControllerTest, AllowShowingFromCurrentSelection) {
   gfx::RectF end_rect(50, 5, 0, 10);
   bool visible = true;
 
-  // The selection should not have be activated, as it wasn't yet allowed.
+  // The selection should not be activated, as it wasn't yet allowed.
   ChangeSelection(start_rect, visible, end_rect, visible);
   EXPECT_EQ(gfx::PointF(), GetLastEventAnchor());
 
   // Now explicitly allow showing from the previously supplied bounds.
   controller().AllowShowingFromCurrentSelection();
-  EXPECT_EQ(SELECTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_SHOWN));
   EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
 
   // Repeated calls to show from the current selection should be ignored.
   controller().AllowShowingFromCurrentSelection();
-  EXPECT_EQ(SELECTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(0, total_event_count());
   EXPECT_EQ(start_rect.bottom_left(), GetLastEventAnchor());
 
   // Trying to show from an empty selection will have no result.
   ClearSelection();
-  EXPECT_EQ(SELECTION_CLEARED, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(SELECTION_CLEARED));
   controller().AllowShowingFromCurrentSelection();
-  EXPECT_EQ(SELECTION_CLEARED, GetLastEventType());
+  EXPECT_EQ(0, total_event_count());
 
   // Showing the insertion handle should also be supported.
   controller().OnSelectionEditable(true);
@@ -903,7 +991,8 @@ TEST_F(TouchSelectionControllerTest, AllowShowingFromCurrentSelection) {
   gfx::RectF insertion_rect(5, 5, 0, 10);
   ChangeInsertion(insertion_rect, visible);
   controller().AllowShowingFromCurrentSelection();
-  EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(1, total_event_count());
+  EXPECT_EQ(1, GetAndResetEventCount(INSERTION_SHOWN));
   EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
 }