mus: Add watcher for all touch events.

services/ui/ws/test_utils.cc

Index: services/ui/ws/test_utils.cc
diff --git a/services/ui/ws/test_utils.cc b/services/ui/ws/test_utils.cc
index 36cc25f47f1f1a3968451a40cbbf1e0b4c1259c9..ae10a8d0a473afa8cc78e5409c5f1eee8775b815 100644
--- a/services/ui/ws/test_utils.cc
+++ b/services/ui/ws/test_utils.cc
@@ -113,9 +113,13 @@ PlatformDisplay* TestPlatformDisplayFactory::CreatePlatformDisplay() {
 WindowTreeTestApi::WindowTreeTestApi(WindowTree* tree) : tree_(tree) {}
 WindowTreeTestApi::~WindowTreeTestApi() {}
 
-void WindowTreeTestApi::SetEventObserver(mojom::EventMatcherPtr matcher,
-                                         uint32_t event_observer_id) {
-  tree_->SetEventObserver(std::move(matcher), event_observer_id);
+void WindowTreeTestApi::AddEventObserver(mojom::EventMatcherPtr matcher,
+                                             uint32_t event_observer_id) {
+  tree_->AddEventObserver(std::move(matcher), event_observer_id);
+}
+
+void WindowTreeTestApi::RemoveEventObserver(uint32_t event_observer_id) {
+  tree_->RemoveEventObserver(event_observer_id);
 }
 
 // DisplayTestApi  ------------------------------------------------------------
@@ -282,16 +286,16 @@ void TestWindowTreeClient::OnWindowSharedPropertyChanged(
   tracker_.OnWindowSharedPropertyChanged(window, name, std::move(new_data));
 }
 
-void TestWindowTreeClient::OnWindowInputEvent(uint32_t event_id,
-                                              uint32_t window,
-                                              std::unique_ptr<ui::Event> event,
-                                              uint32_t event_observer_id) {
-  tracker_.OnWindowInputEvent(window, *event.get(), event_observer_id);
+void TestWindowTreeClient::OnWindowInputEvent(
+  uint32_t event_id, uint32_t window, std::unique_ptr<ui::Event> event,
+  mojo::Array<uint32_t> event_observer_ids) {
+  tracker_.OnWindowInputEvent(window, *event.get(),
+    std::move(event_observer_ids));
 }
 
-void TestWindowTreeClient::OnEventObserved(std::unique_ptr<ui::Event> event,
-                                           uint32_t event_observer_id) {
-  tracker_.OnEventObserved(*event.get(), event_observer_id);
+void TestWindowTreeClient::OnEventObserved(
+  std::unique_ptr<ui::Event> event, mojo::Array<uint32_t> event_observer_ids) {
+  tracker_.OnEventObserved(*event.get(), std::move(event_observer_ids));
 }
 
 void TestWindowTreeClient::OnWindowFocused(uint32_t focused_window_id) {