mus: Add watcher for all touch events.

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 11627217555415ec5c77f0cb8f305387220d5bd5..364a9b9bf1e877d2bc70437adf1547c80c4d1c25 100644
--- a/services/ui/ws/test_utils.h
+++ b/services/ui/ws/test_utils.h
@@ -103,8 +103,9 @@ class WindowTreeTestApi {
     tree_->OnWindowInputEventAck(tree_->event_ack_id_, result);
   }
 
-  void SetEventObserver(mojom::EventMatcherPtr matcher,
+  void AddEventObserver(mojom::EventMatcherPtr matcher,
                         uint32_t event_observer_id);
+  void RemoveEventObserver(uint32_t event_observer_id);
 
  private:
   WindowTree* tree_;
@@ -365,9 +366,9 @@ class TestWindowTreeClient : public ui::mojom::WindowTreeClient {
   void OnWindowInputEvent(uint32_t event_id,
                           uint32_t window,
                           std::unique_ptr<ui::Event> event,
-                          uint32_t event_observer_id) override;
+                          mojo::Array<uint32_t> event_observer_id) override;
   void OnEventObserved(std::unique_ptr<ui::Event> event,
-                       uint32_t event_observer_id) override;
+                       mojo::Array<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;