Update ui::PointerEvent to support mouse wheel and capture change events.

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/message_loop/message_loop.h"
 #include "services/ui/public/cpp/tests/window_tree_client_private.h"
@@ skipping 113 matching lines @@
   ASSERT_TRUE(pointer_watcher_event_router);
 
   ui::PointerEvent pointer_event_down(
       ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_NONE, 1,
       ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH),
       base::TimeTicks());
   ui::PointerEvent pointer_event_up(
       ui::ET_POINTER_UP, gfx::Point(), gfx::Point(), ui::EF_NONE, 1,
       ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
       base::TimeTicks());
+  ui::PointerEvent pointer_event_wheel(
+      ui::ET_POINTER_WHEEL_CHANGED, gfx::Point(), gfx::Point(), ui::EF_NONE, 1,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
+      base::TimeTicks());
+  ui::PointerEvent pointer_event_capture(
+      ui::ET_POINTER_CAPTURE_CHANGED, gfx::Point(), gfx::Point(), ui::EF_NONE,
+      1, ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
+      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.
   OnPointerEventObserved(pointer_event_up);
   EXPECT_EQ(ui::ET_POINTER_UP, watcher1.last_event_observed()->type());
   watcher1.Reset();
 
+  // PointerWatchers receive pointer wheel changed events.
+  OnPointerEventObserved(pointer_event_wheel);
+  EXPECT_EQ(ui::ET_POINTER_WHEEL_CHANGED,
+            watcher1.last_event_observed()->type());
+  watcher1.Reset();
+
+  // PointerWatchers receive pointer capture changed events.
+  OnPointerEventObserved(pointer_event_capture);
+  EXPECT_EQ(ui::ET_POINTER_CAPTURE_CHANGED,
+            watcher1.last_event_observed()->type());
+  watcher1.Reset();
+
   // Two PointerWatchers can both receive a single observed event.
   TestPointerWatcher watcher2;
   pointer_watcher_event_router->AddPointerWatcher(&watcher2, false);
   OnPointerEventObserved(pointer_event_down);
   EXPECT_EQ(ui::ET_POINTER_DOWN, watcher1.last_event_observed()->type());
   EXPECT_EQ(ui::ET_POINTER_DOWN, watcher2.last_event_observed()->type());
   watcher1.Reset();
   watcher2.Reset();
 
   // Removing the first PointerWatcher stops sending events to it.
@@ skipping 58 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