Add id properties to PointerEvent

ui/events/event_unittest.cc

 // Copyright (c) 2012 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/events/event.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 800 matching lines @@
     EXPECT_FALSE(pointer_event.IsTouchEvent());
     EXPECT_TRUE(pointer_event.IsPointerEvent());
   }
 }
 
 TEST(EventTest, PointerEventId) {
   {
     ui::MouseEvent mouse_event(ui::ET_MOUSE_PRESSED, gfx::Point(0, 0),
                                gfx::Point(0, 0), base::TimeTicks(), 0, 0);
     ui::PointerEvent pointer_event(mouse_event);
-    EXPECT_EQ(pointer_event.pointer_id(), ui::PointerEvent::kMousePointerId);
+    EXPECT_EQ(pointer_event.pointer_details().id,
+              ui::PointerEvent::kMousePointerId);
   }
 
   for (int touch_id = 0; touch_id < 8; touch_id++) {
     ui::TouchEvent touch_event(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), touch_id,
                                base::TimeTicks());
     ui::PointerEvent pointer_event(touch_event);
-    EXPECT_EQ(pointer_event.pointer_id(), touch_id);
+    EXPECT_EQ(pointer_event.pointer_details().id,
+              static_cast<uint32_t>(touch_id));
   }
 }
 
 TEST(EventTest, PointerDetailsPointer) {
   const float kRadiusX = 10.0f;
   const float kRadiusY = 5.0f;
   const float kForce = 15.0f;
   ui::TouchEvent touch_event(ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0,
                              ui::EventTimeForNow(), kRadiusX, kRadiusY, 0.0f,
                              kForce);
@@ skipping 17 matching lines @@
 TEST(EventTest, PointerEventClone) {
   {
     ui::PointerEvent ptr_event(
         ui::TouchEvent(ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0,
                        ui::EventTimeForNow(), 10.0f, 5.0f, 0.0f, 15.0f));
     std::unique_ptr<ui::Event> clone(ui::Event::Clone(ptr_event));
     EXPECT_TRUE(clone->IsPointerEvent());
     ui::PointerEvent* clone_as_ptr = clone->AsPointerEvent();
 
     EXPECT_EQ(ptr_event.type(), clone_as_ptr->type());
-    EXPECT_EQ(ptr_event.pointer_id(), clone_as_ptr->pointer_id());
+    EXPECT_EQ(ptr_event.pointer_details().id,
+              clone_as_ptr->pointer_details().id);
     EXPECT_EQ(ptr_event.pointer_details(), clone_as_ptr->pointer_details());
     EXPECT_EQ(ptr_event.location(), clone_as_ptr->location());
     EXPECT_EQ(ptr_event.root_location(), clone_as_ptr->root_location());
   }
 
   {
     ui::PointerEvent ptr_event(
         ui::MouseEvent(ET_MOUSE_PRESSED, gfx::Point(0, 0), gfx::Point(0, 0),
                        ui::EventTimeForNow(), 0, 0));
     std::unique_ptr<ui::Event> clone(ui::Event::Clone(ptr_event));
     EXPECT_TRUE(clone->IsPointerEvent());
     ui::PointerEvent* clone_as_ptr = clone->AsPointerEvent();
 
     EXPECT_EQ(ptr_event.type(), clone_as_ptr->type());
-    EXPECT_EQ(ptr_event.pointer_id(), clone_as_ptr->pointer_id());
+    EXPECT_EQ(ptr_event.pointer_details().id,
+              clone_as_ptr->pointer_details().id);
     EXPECT_EQ(ptr_event.pointer_details(), clone_as_ptr->pointer_details());
     EXPECT_EQ(ptr_event.location(), clone_as_ptr->location());
     EXPECT_EQ(ptr_event.root_location(), clone_as_ptr->root_location());
   }
 }
 
 TEST(EventTest, MouseEventLatencyUIComponentExists) {
   const gfx::Point origin(0, 0);
   MouseEvent mouseev(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), 0, 0);
   EXPECT_TRUE(mouseev.latency()->FindLatency(
@@ skipping 71 matching lines @@
 }
 
 TEST(EventTest, PointerEventToTouchEventDetails) {
   ui::PointerEvent pointer_event(
       ui::TouchEvent(ui::ET_TOUCH_PRESSED, gfx::Point(12, 14), 0, 15,
                      EventTimeForNow(), 11.5, 13.5, 13.0, 0.5));
   ui::TouchEvent touch_event(pointer_event);
 
   EXPECT_EQ(pointer_event.location(), touch_event.location());
   EXPECT_EQ(pointer_event.flags(), touch_event.flags());
-  EXPECT_EQ(pointer_event.pointer_id(), touch_event.touch_id());
+  EXPECT_EQ(pointer_event.pointer_details().id,
+            touch_event.pointer_details().id);
   EXPECT_EQ(pointer_event.pointer_details(), touch_event.pointer_details());
   EXPECT_EQ(pointer_event.time_stamp(), touch_event.time_stamp());
 }
 
 TEST(EventTest, PointerEventSourceEventTypeExistsInLatencyInfo) {
   ui::PointerEvent wheel_poniter_event(
       ui::ET_POINTER_WHEEL_CHANGED, gfx::Point(), gfx::Point(), 0, 0, 0,
       ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
       ui::EventTimeForNow());
   EXPECT_EQ(wheel_poniter_event.latency()->source_event_type(),
@@ skipping 53 matching lines @@
   XButtonEvent* button_event = &(native_event.xbutton);
   button_event->type = ButtonPress;
   button_event->button = 4; // A valid wheel button number between min and max.
   MouseWheelEvent mouse_ev(&native_event);
 
   histogram_tester.ExpectTotalCount("Event.Latency.OS.MOUSE_WHEEL", 1);
 #endif
 }
 
 }  // namespace ui