Remove ID from ui::PointerEvent's constructors

ui/events/mojo/event_struct_traits.cc

 // Copyright 2016 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/mojo/event_struct_traits.h"
 
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/dom/keycode_converter.h"
 #include "ui/events/mojo/event_constants.mojom.h"
@@ skipping 264 matching lines @@
 
       const gfx::Point location(pointer_data->location->x,
                                 pointer_data->location->y);
       const gfx::Point screen_location(pointer_data->location->screen_x,
                                        pointer_data->location->screen_y);
 
       switch (pointer_data->kind) {
         case ui::mojom::PointerKind::MOUSE: {
           out->reset(new ui::PointerEvent(
               MojoPointerEventTypeToUIEvent(event.action()), location,
-              screen_location, event.flags(), ui::PointerEvent::kMousePointerId,
+              screen_location, event.flags(),
               pointer_data->changed_button_flags,
               event.action() == ui::mojom::EventType::POINTER_WHEEL_CHANGED
                   ? ui::PointerDetails(
                         ui::EventPointerType::POINTER_TYPE_MOUSE,
                         gfx::Vector2d(
                             static_cast<int>(pointer_data->wheel_data->delta_x),
                             static_cast<int>(
-                                pointer_data->wheel_data->delta_y)))
-                  : ui::PointerDetails(
-                        ui::EventPointerType::POINTER_TYPE_MOUSE),
+                                pointer_data->wheel_data->delta_y)),
+                        ui::PointerEvent::kMousePointerId)
+                  : ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE,
+                                       ui::PointerEvent::kMousePointerId),
               ui::EventTimeForNow()));
           break;
         }
         case ui::mojom::PointerKind::TOUCH: {
           out->reset(new ui::PointerEvent(
               MojoPointerEventTypeToUIEvent(event.action()), location,
-              screen_location, event.flags(), pointer_data->pointer_id,
+              screen_location, event.flags(),
               pointer_data->changed_button_flags,
               ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH,
-                                 /* pointer_id*/ 0,
+                                 /* pointer_id*/ pointer_data->pointer_id,
                                  pointer_data->brush_data->width,
                                  pointer_data->brush_data->height,
                                  pointer_data->brush_data->pressure,
                                  pointer_data->brush_data->tilt_x,
                                  pointer_data->brush_data->tilt_y),
               ui::EventTimeForNow()));
           break;
         }
         case ui::mojom::PointerKind::PEN:
           NOTIMPLEMENTED();
           return false;
       }
       break;
     }
     case ui::mojom::EventType::UNKNOWN:
       return false;
   }
 
   if (!out->get())
     return false;
 
   return event.ReadLatency((*out)->latency());
 }
 
 }  // namespace mojo