mus: Change PointerWatcher to observe all pointer events, with moves optional.

services/ui/ws/test_utils.h

Index: services/ui/ws/test_utils.h
diff --git a/services/ui/ws/test_utils.h b/services/ui/ws/test_utils.h
index bf8d5deed7dff860efde9bc2a33884f87894bcf5..b1f6d0b625818bbaabc2af6c15412f403897aacd 100644
--- a/services/ui/ws/test_utils.h
+++ b/services/ui/ws/test_utils.h
@@ -110,8 +110,8 @@ class WindowTreeTestApi {
     tree_->OnAcceleratorAck(tree_->event_ack_id_, result);
   }
 
-  void SetEventObserver(mojom::EventMatcherPtr matcher,
-                        uint32_t event_observer_id);
+  void StartPointerWatcher(bool want_moves, uint32_t pointer_watcher_id);
+  void StopPointerWatcher();
 
  private:
   WindowTree* tree_;
@@ -401,8 +401,8 @@ class TestWindowTreeClient : public ui::mojom::WindowTreeClient {
                           uint32_t window,
                           std::unique_ptr<ui::Event> event,
                           uint32_t event_observer_id) override;
-  void OnEventObserved(std::unique_ptr<ui::Event> event,
-                       uint32_t event_observer_id) override;
+  void OnPointerWatcherEvent(std::unique_ptr<ui::Event> event,
+                             uint32_t event_observer_id) override;
   void OnWindowFocused(uint32_t focused_window_id) override;
   void OnWindowPredefinedCursorChanged(uint32_t window_id,
                                        mojom::Cursor cursor_id) override;