Suppressed MEs for gestures from cancelled PEs

ui/events/gesture_detection/gesture_event_data_packet_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 <stddef.h>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/gesture_detection/gesture_event_data_packet.h"
 #include "ui/events/test/motion_event_test_utils.h"
 
 using ui::test::MockMotionEvent;
 
 namespace ui {
 namespace {
 
 const float kTouchX = 13.7f;
 const float kTouchY = 14.2f;
+const uint32_t uniqueTouchEventId = 1234U;
 
 GestureEventData CreateGesture(EventType type) {
   return GestureEventData(GestureEventDetails(type),
                           0,
                           MotionEvent::TOOL_TYPE_FINGER,
                           base::TimeTicks(),
                           kTouchX,
                           kTouchY,
                           kTouchX + 5.f,
                           kTouchY + 10.f,
                           1,
                           gfx::RectF(kTouchX - 1.f, kTouchY - 1.f, 2.f, 2.f),
-                          EF_NONE);
+                          EF_NONE,
+                          uniqueTouchEventId);
 }
 
 }  // namespace
 
 bool GestureEquals(const GestureEventData& lhs, const GestureEventData& rhs) {
   return lhs.type() == rhs.type() &&
          lhs.motion_event_id == rhs.motion_event_id &&
          lhs.primary_tool_type == rhs.primary_tool_type &&
          lhs.time == rhs.time && lhs.x == rhs.x && lhs.y == rhs.y &&
-         lhs.raw_x == rhs.raw_x && lhs.raw_y == rhs.raw_y;
+         lhs.raw_x == rhs.raw_x && lhs.raw_y == rhs.raw_y &&
+         lhs.unique_touch_event_id == rhs.unique_touch_event_id;
 }
 
 bool PacketEquals(const GestureEventDataPacket& lhs,
                   const GestureEventDataPacket& rhs) {
   if (lhs.timestamp() != rhs.timestamp() ||
       lhs.gesture_count() != rhs.gesture_count() ||
       lhs.timestamp() != rhs.timestamp() ||
       lhs.gesture_source() != rhs.gesture_source() ||
       lhs.touch_location() != rhs.touch_location() ||
       lhs.raw_touch_location() != rhs.raw_touch_location())
@@ skipping 75 matching lines @@
 
   GestureEventData gesture = CreateGesture(ET_GESTURE_TAP);
   packet = GestureEventDataPacket::FromTouchTimeout(gesture);
   EXPECT_EQ(GestureEventDataPacket::TOUCH_TIMEOUT, packet.gesture_source());
   EXPECT_EQ(1U, packet.gesture_count());
   EXPECT_EQ(base::TimeTicks(), packet.timestamp());
   EXPECT_EQ(gfx::PointF(gesture.x, gesture.y), packet.touch_location());
 }
 
 }  // namespace ui