Remove ID from ui::PointerEvent's constructors

ui/views/mus/pointer_watcher_event_router_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 "ui/views/mus/pointer_watcher_event_router.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 104 matching lines @@
 
 TEST_F(PointerWatcherEventRouterTest, PointerWatcherNoMove) {
   base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
   ScopedViewsTestHelper helper;
   ASSERT_TRUE(MusClient::Get());
   PointerWatcherEventRouter* pointer_watcher_event_router =
       MusClient::Get()->pointer_watcher_event_router();
   ASSERT_TRUE(pointer_watcher_event_router);
 
   ui::PointerEvent pointer_event_down(
-      ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_NONE, 1, 0,
-      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH),
+      ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_NONE, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 1),
       base::TimeTicks());
   ui::PointerEvent pointer_event_up(
-      ui::ET_POINTER_UP, gfx::Point(), gfx::Point(), ui::EF_NONE, 1, 0,
-      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
+      ui::ET_POINTER_UP, gfx::Point(), gfx::Point(), ui::EF_NONE, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE, 1),
       base::TimeTicks());
   ui::PointerEvent pointer_event_wheel(
-      ui::ET_POINTER_WHEEL_CHANGED, gfx::Point(), gfx::Point(), ui::EF_NONE, 1,
-      0, ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
+      ui::ET_POINTER_WHEEL_CHANGED, gfx::Point(), gfx::Point(), ui::EF_NONE, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE, 1),
       base::TimeTicks());
   ui::PointerEvent pointer_event_capture(
       ui::ET_POINTER_CAPTURE_CHANGED, gfx::Point(), gfx::Point(), ui::EF_NONE,
-      1, 0, ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
+      0, ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE, 1),
       base::TimeTicks());
 
   // PointerWatchers receive pointer down events.
   TestPointerWatcher watcher1;
   pointer_watcher_event_router->AddPointerWatcher(&watcher1, false);
   OnPointerEventObserved(pointer_event_down);
   EXPECT_EQ(ui::ET_POINTER_DOWN, watcher1.last_event_observed()->type());
   watcher1.Reset();
 
   // PointerWatchers receive pointer up events.
@@ skipping 39 matching lines @@
 
 TEST_F(PointerWatcherEventRouterTest, PointerWatcherMove) {
   base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
   ScopedViewsTestHelper helper;
   ASSERT_TRUE(MusClient::Get());
   PointerWatcherEventRouter* pointer_watcher_event_router =
       MusClient::Get()->pointer_watcher_event_router();
   ASSERT_TRUE(pointer_watcher_event_router);
 
   ui::PointerEvent pointer_event_down(
-      ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_NONE, 1, 0,
-      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH),
+      ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_NONE, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 1),
       base::TimeTicks());
   ui::PointerEvent pointer_event_move(
-      ui::ET_POINTER_MOVED, gfx::Point(), gfx::Point(), ui::EF_NONE, 1, 0,
-      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH),
+      ui::ET_POINTER_MOVED, gfx::Point(), gfx::Point(), ui::EF_NONE, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 1),
       base::TimeTicks());
 
   // PointerWatchers receive pointer down events.
   TestPointerWatcher watcher1;
   pointer_watcher_event_router->AddPointerWatcher(&watcher1, true);
   OnPointerEventObserved(pointer_event_down);
   EXPECT_EQ(ui::ET_POINTER_DOWN, watcher1.last_event_observed()->type());
   watcher1.Reset();
 
   // PointerWatchers receive pointer move events.
@@ skipping 19 matching lines @@
   watcher2.Reset();
 
   // Removing the last PointerWatcher stops sending events to it.
   pointer_watcher_event_router->RemovePointerWatcher(&watcher2);
   OnPointerEventObserved(pointer_event_move);
   EXPECT_FALSE(watcher1.last_event_observed());
   EXPECT_FALSE(watcher2.last_event_observed());
 }
 
 }  // namespace views