Remove ID from ui::PointerEvent's constructors

ui/events/mojo/struct_traits_unittest.cc

Index: ui/events/mojo/struct_traits_unittest.cc
diff --git a/ui/events/mojo/struct_traits_unittest.cc b/ui/events/mojo/struct_traits_unittest.cc
index ab44dbd54e304bb33ca9bc1fc5aa9ce83a203dad..83d64a8176d2971e558f069476d50919ce939275 100644
--- a/ui/events/mojo/struct_traits_unittest.cc
+++ b/ui/events/mojo/struct_traits_unittest.cc
@@ -166,35 +166,39 @@ TEST_F(StructTraitsTest, KeyEvent) {
 TEST_F(StructTraitsTest, PointerEvent) {
   PointerEvent kTestData[] = {
       // Mouse pointer events:
-      {ET_POINTER_DOWN, gfx::Point(10, 10), gfx::Point(20, 30), EF_NONE,
-       PointerEvent::kMousePointerId, 0,
-       PointerDetails(EventPointerType::POINTER_TYPE_MOUSE), base::TimeTicks()},
+      {ET_POINTER_DOWN, gfx::Point(10, 10), gfx::Point(20, 30), EF_NONE, 0,
+       PointerDetails(EventPointerType::POINTER_TYPE_MOUSE,
+                      PointerEvent::kMousePointerId),
+       base::TimeTicks()},
       {ET_POINTER_MOVED, gfx::Point(1, 5), gfx::Point(5, 1),
-       EF_LEFT_MOUSE_BUTTON, PointerEvent::kMousePointerId,
-       EF_LEFT_MOUSE_BUTTON,
-       PointerDetails(EventPointerType::POINTER_TYPE_MOUSE), base::TimeTicks()},
+       EF_LEFT_MOUSE_BUTTON, EF_LEFT_MOUSE_BUTTON,
+       PointerDetails(EventPointerType::POINTER_TYPE_MOUSE,
+                      PointerEvent::kMousePointerId),
+       base::TimeTicks()},
       {ET_POINTER_UP, gfx::Point(411, 130), gfx::Point(20, 30),
-       EF_MIDDLE_MOUSE_BUTTON | EF_RIGHT_MOUSE_BUTTON,
-       PointerEvent::kMousePointerId, EF_RIGHT_MOUSE_BUTTON,
-       PointerDetails(EventPointerType::POINTER_TYPE_MOUSE), base::TimeTicks()},
+       EF_MIDDLE_MOUSE_BUTTON | EF_RIGHT_MOUSE_BUTTON, EF_RIGHT_MOUSE_BUTTON,
+       PointerDetails(EventPointerType::POINTER_TYPE_MOUSE,
+                      PointerEvent::kMousePointerId),
+       base::TimeTicks()},
       {ET_POINTER_EXITED, gfx::Point(10, 10), gfx::Point(20, 30),
-       EF_BACK_MOUSE_BUTTON, PointerEvent::kMousePointerId, 0,
-       PointerDetails(EventPointerType::POINTER_TYPE_MOUSE), base::TimeTicks()},
+       EF_BACK_MOUSE_BUTTON, 0,
+       PointerDetails(EventPointerType::POINTER_TYPE_MOUSE,
+                      PointerEvent::kMousePointerId),
+       base::TimeTicks()},
 
       // Touch pointer events:
-      {ET_POINTER_DOWN, gfx::Point(10, 10), gfx::Point(20, 30), EF_NONE, 1, 0,
+      {ET_POINTER_DOWN, gfx::Point(10, 10), gfx::Point(20, 30), EF_NONE, 0,
        PointerDetails(EventPointerType::POINTER_TYPE_TOUCH,
-                      /* pointer_id*/ 0,
+                      /* pointer_id*/ 1,
                       /* radius_x */ 1.0f,
                       /* radius_y */ 2.0f,
                       /* force */ 3.0f,
                       /* tilt_x */ 4.0f,
                       /* tilt_y */ 5.0f),
        base::TimeTicks()},
-      {ET_POINTER_CANCELLED, gfx::Point(120, 120), gfx::Point(2, 3), EF_NONE, 2,
-       0,
+      {ET_POINTER_CANCELLED, gfx::Point(120, 120), gfx::Point(2, 3), EF_NONE, 0,
        PointerDetails(EventPointerType::POINTER_TYPE_TOUCH,
-                      /* pointer_id*/ 0,
+                      /* pointer_id*/ 2,
                       /* radius_x */ 5.5f,
                       /* radius_y */ 4.5f,
                       /* force */ 3.5f,