Remove ID from ui::PointerEvent's constructors

ui/events/mojo/struct_traits_unittest.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 "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/keycodes/dom/dom_code.h"
 #include "ui/events/mojo/traits_test_service.mojom.h"
 
@@ skipping 148 matching lines @@
     EXPECT_EQ(kTestData[i].GetConflatedWindowsKeyCode(),
               output_key_event->GetConflatedWindowsKeyCode());
     EXPECT_EQ(kTestData[i].code(), output_key_event->code());
     EXPECT_EQ(kTestData[i].time_stamp(), output_key_event->time_stamp());
   }
 }
 
 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,
                       /* tilt_x */ 2.5f,
                       /* tilt_y */ 0.5f),
        base::TimeTicks()},
   };
 
   mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
   for (size_t i = 0; i < arraysize(kTestData); i++) {
@@ skipping 37 matching lines @@
     EXPECT_EQ(kTestData[i].flags(), output_pointer_event->flags());
     EXPECT_EQ(kTestData[i].location(), output_pointer_event->location());
     EXPECT_EQ(kTestData[i].root_location(),
               output_pointer_event->root_location());
     EXPECT_EQ(kTestData[i].offset(),
               output_pointer_event->pointer_details().offset);
   }
 }
 
 }  // namespace ui