Add pointer id to the WebMouseEvent'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/event.h"
 #include "ui/events/keycodes/dom/dom_code.h"
 #include "ui/events/mojo/event.mojom.h"
@@ skipping 65 matching lines @@
     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, 0,
        PointerDetails(EventPointerType::POINTER_TYPE_MOUSE,
-                      MouseEvent::kMousePointerId),
+                      MouseEvent::kDefaultMousePointerId),
        base::TimeTicks()},
       {ET_POINTER_MOVED, gfx::Point(1, 5), gfx::Point(5, 1),
        EF_LEFT_MOUSE_BUTTON, EF_LEFT_MOUSE_BUTTON,
        PointerDetails(EventPointerType::POINTER_TYPE_MOUSE,
-                      MouseEvent::kMousePointerId),
+                      MouseEvent::kDefaultMousePointerId),
        base::TimeTicks()},
       {ET_POINTER_UP, gfx::Point(411, 130), gfx::Point(20, 30),
        EF_MIDDLE_MOUSE_BUTTON | EF_RIGHT_MOUSE_BUTTON, EF_RIGHT_MOUSE_BUTTON,
        PointerDetails(EventPointerType::POINTER_TYPE_MOUSE,
-                      MouseEvent::kMousePointerId),
+                      MouseEvent::kDefaultMousePointerId),
        base::TimeTicks()},
       {ET_POINTER_EXITED, gfx::Point(10, 10), gfx::Point(20, 30),
        EF_BACK_MOUSE_BUTTON, 0,
        PointerDetails(EventPointerType::POINTER_TYPE_MOUSE,
-                      MouseEvent::kMousePointerId),
+                      MouseEvent::kDefaultMousePointerId),
        base::TimeTicks()},
 
       // Touch pointer events:
       {ET_POINTER_DOWN, gfx::Point(10, 10), gfx::Point(20, 30), EF_NONE, 0,
        PointerDetails(EventPointerType::POINTER_TYPE_TOUCH,
                       /* pointer_id*/ 1,
                       /* radius_x */ 1.0f,
                       /* radius_y */ 2.0f,
                       /* force */ 3.0f,
                       /* tilt_x */ 4.0f,
@@ skipping 69 matching lines @@
   std::unique_ptr<Event> event_ptr = Event::Clone(key_event);
   std::unique_ptr<Event> deserialized;
   ASSERT_TRUE(mojom::Event::Deserialize(mojom::Event::Serialize(&event_ptr),
                                         &deserialized));
   ASSERT_TRUE(deserialized->IsKeyEvent());
   ASSERT_TRUE(deserialized->AsKeyEvent()->properties());
   EXPECT_EQ(properties, *(deserialized->AsKeyEvent()->properties()));
 }
 
 }  // namespace ui