Remove ID from ui::PointerEvent's constructors

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 960 matching lines @@
       {ui::ET_POINTER_ENTERED, ui::ET_MOUSE_ENTERED, gfx::Point(), gfx::Point(),
        EF_MIDDLE_MOUSE_BUTTON | EF_RIGHT_MOUSE_BUTTON, 0},
       {ui::ET_POINTER_EXITED, ui::ET_MOUSE_EXITED, gfx::Point(5, 1),
        gfx::Point(1, 5), EF_RIGHT_MOUSE_BUTTON, 0},
       {ui::ET_POINTER_UP, ui::ET_MOUSE_RELEASED, gfx::Point(1000, 1000),
        gfx::Point(14, 15), EF_MIDDLE_MOUSE_BUTTON, EF_MIDDLE_MOUSE_BUTTON}};
 
   for (size_t i = 0; i < arraysize(kTestData); i++) {
     ui::PointerEvent pointer_event(
         kTestData[i].in_type, kTestData[i].location, kTestData[i].root_location,
-        kTestData[i].flags, 0, kTestData[i].changed_button_flags,
-        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
+        kTestData[i].flags, kTestData[i].changed_button_flags,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE, 0),
         base::TimeTicks());
     ui::MouseEvent mouse_event(pointer_event);
 
     EXPECT_EQ(kTestData[i].out_type, mouse_event.type());
     EXPECT_EQ(kTestData[i].location, mouse_event.location());
     EXPECT_EQ(kTestData[i].root_location, mouse_event.root_location());
     EXPECT_EQ(kTestData[i].flags, mouse_event.flags());
     EXPECT_EQ(kTestData[i].changed_button_flags,
               mouse_event.changed_button_flags());
   }
 }
 
 TEST(EventTest, PointerEventToTouchEventType) {
   ui::EventType kTouchTypeMap[][2] = {
       {ui::ET_POINTER_DOWN, ui::ET_TOUCH_PRESSED},
       {ui::ET_POINTER_MOVED, ui::ET_TOUCH_MOVED},
       {ui::ET_POINTER_UP, ui::ET_TOUCH_RELEASED},
       {ui::ET_POINTER_CANCELLED, ui::ET_TOUCH_CANCELLED},
   };
 
   for (size_t i = 0; i < arraysize(kTouchTypeMap); i++) {
     ui::PointerEvent pointer_event(
-        kTouchTypeMap[i][0], gfx::Point(), gfx::Point(), 0, 0, 0,
+        kTouchTypeMap[i][0], gfx::Point(), gfx::Point(), 0, 0,
         ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0),
         base::TimeTicks());
     ui::TouchEvent touch_event(pointer_event);
 
     EXPECT_EQ(kTouchTypeMap[i][1], touch_event.type());
   }
 }
 
 TEST(EventTest, PointerEventToTouchEventDetails) {
   ui::PointerEvent pointer_event(ui::TouchEvent(
       ui::ET_TOUCH_PRESSED, gfx::Point(12, 14), EventTimeForNow(),
       PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH,
                      /* pointer_id*/ 15,
                      /* radius_x */ 11.5,
                      /* radius_y */ 13.5,
                      /* force */ 0.5),
       0, 13.0));
   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_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::ET_POINTER_WHEEL_CHANGED, gfx::Point(), gfx::Point(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE, 0),
       ui::EventTimeForNow());
   EXPECT_EQ(wheel_poniter_event.latency()->source_event_type(),
             ui::SourceEventType::WHEEL);
 
   ui::PointerEvent touch_poniter_event(
-      ui::ET_TOUCH_PRESSED, gfx::Point(), gfx::Point(), 0, 0, 0,
+      ui::ET_TOUCH_PRESSED, gfx::Point(), gfx::Point(), 0, 0,
       ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0),
       ui::EventTimeForNow());
   EXPECT_EQ(touch_poniter_event.latency()->source_event_type(),
             ui::SourceEventType::TOUCH);
 }
 
 // Checks that Event.Latency.OS.TOUCH_PRESSED, TOUCH_MOVED,
 // and TOUCH_RELEASED histograms are computed properly.
 #if defined(USE_X11)
 TEST(EventTest, EventLatencyOSTouchHistograms) {
@@ skipping 39 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