Updates PointerEventRouter to handle switching move type

services/ui/public/cpp/window_tree_client.h

Index: services/ui/public/cpp/window_tree_client.h
diff --git a/services/ui/public/cpp/window_tree_client.h b/services/ui/public/cpp/window_tree_client.h
index e3b527f183b87f5ac58d4a2be0fb238b7f8e6309..9e9959d8534d025db5613f707463091e4c5800c7 100644
--- a/services/ui/public/cpp/window_tree_client.h
+++ b/services/ui/public/cpp/window_tree_client.h
@@ -311,9 +311,8 @@ class WindowTreeClient : public mojom::WindowTreeClient,
   void OnWindowInputEvent(uint32_t event_id,
                           Id window_id,
                           std::unique_ptr<ui::Event> event,
-                          uint32_t pointer_watcher_id) override;
+                          bool matches_pointer_watcher) override;
   void OnPointerEventObserved(std::unique_ptr<ui::Event> event,
-                              uint32_t pointer_watcher_id,
                               uint32_t window_id) override;
   void OnWindowFocused(Id focused_window_id) override;
   void OnWindowPredefinedCursorChanged(Id window_id,
@@ -419,9 +418,6 @@ class WindowTreeClient : public mojom::WindowTreeClient,
 
   bool has_pointer_watcher_ = false;
 
-  // Monotonically increasing ID for pointer watchers.
-  uint32_t pointer_watcher_id_ = 0u;
-
   // The current change id for the client.
   uint32_t current_move_loop_change_ = 0u;