Add id properties to PointerEvent

ui/events/gestures/motion_event_aura.cc

Index: ui/events/gestures/motion_event_aura.cc
diff --git a/ui/events/gestures/motion_event_aura.cc b/ui/events/gestures/motion_event_aura.cc
index 5a414d794ef621a0694dd0ee7d07844a0bf8c0f2..1cac1373e5edb1d74742c4d3efe2c1b6be073c5d 100644
--- a/ui/events/gestures/motion_event_aura.cc
+++ b/ui/events/gestures/motion_event_aura.cc
@@ -34,7 +34,7 @@ PointerProperties GetPointerPropertiesFromTouchEvent(const TouchEvent& touch) {
   pointer_properties.y = touch.y();
   pointer_properties.raw_x = touch.root_location_f().x();
   pointer_properties.raw_y = touch.root_location_f().y();
-  pointer_properties.id = touch.touch_id();
+  pointer_properties.id = touch.pointer_details().id;
   pointer_properties.pressure = touch.pointer_details().force;
   pointer_properties.source_device_id = touch.source_device_id();
 
@@ -62,7 +62,7 @@ MotionEventAura::MotionEventAura() {}
 MotionEventAura::~MotionEventAura() {}
 
 bool MotionEventAura::OnTouch(const TouchEvent& touch) {
-  int index = FindPointerIndexOfId(touch.touch_id());
+  int index = FindPointerIndexOfId(touch.pointer_details().id);
   bool pointer_id_is_active = index != -1;
 
   if (touch.type() == ET_TOUCH_PRESSED && pointer_id_is_active) {
@@ -113,7 +113,7 @@ void MotionEventAura::CleanupRemovedTouchPoints(const TouchEvent& event) {
   }
 
   DCHECK(GetPointerCount());
-  int index_to_delete = GetIndexFromId(event.touch_id());
+  int index_to_delete = GetIndexFromId(event.pointer_details().id);
   set_action_index(-1);
   set_action(MotionEvent::ACTION_NONE);
   pointer(index_to_delete) = pointer(GetPointerCount() - 1);
@@ -134,7 +134,7 @@ bool MotionEventAura::AddTouch(const TouchEvent& touch) {
 }
 
 void MotionEventAura::UpdateTouch(const TouchEvent& touch) {
-  pointer(GetIndexFromId(touch.touch_id())) =
+  pointer(GetIndexFromId(touch.pointer_details().id)) =
       GetPointerPropertiesFromTouchEvent(touch);
 }
 
@@ -146,7 +146,7 @@ void MotionEventAura::UpdateCachedAction(const TouchEvent& touch) {
         set_action(ACTION_DOWN);
       } else {
         set_action(ACTION_POINTER_DOWN);
-        set_action_index(GetIndexFromId(touch.touch_id()));
+        set_action_index(GetIndexFromId(touch.pointer_details().id));
       }
       break;
     case ET_TOUCH_RELEASED:
@@ -154,7 +154,7 @@ void MotionEventAura::UpdateCachedAction(const TouchEvent& touch) {
         set_action(ACTION_UP);
       } else {
         set_action(ACTION_POINTER_UP);
-        set_action_index(GetIndexFromId(touch.touch_id()));
+        set_action_index(GetIndexFromId(touch.pointer_details().id));
       }
       break;
     case ET_TOUCH_CANCELLED: