mus: Add watcher for all touch events.

services/ui/ws/window_tree_unittest.cc

 // Copyright 2014 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 "services/ui/ws/window_tree.h"
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
@@ skipping 307 matching lines @@
   EXPECT_NO_FATAL_FAILURE(SetupEventTargeting(&client, &tree, &window));
 
   // Create an event outside the bounds of the client.
   ui::PointerEvent pointer_down = CreatePointerDownEvent(5, 5);
 
   // Events are not observed before setting an observer.
   DispatchEventAndAckImmediately(pointer_down);
   ASSERT_EQ(0u, client->tracker()->changes()->size());
 
   // Create an observer for pointer-down events.
-  WindowTreeTestApi(tree).SetEventObserver(
+  WindowTreeTestApi(tree).AddEventObserver(
       CreateEventMatcher(ui::mojom::EventType::POINTER_DOWN), 111u);
 
   // Pointer-down events are sent to the client.
   DispatchEventAndAckImmediately(pointer_down);
   ASSERT_EQ(1u, client->tracker()->changes()->size());
   EXPECT_EQ("EventObserved event_action=16 event_observer_id=111",
             ChangesToDescription1(*client->tracker()->changes())[0]);
   client->tracker()->changes()->clear();
 
   // Clearing the observer stops sending events to the client.
-  WindowTreeTestApi(tree).SetEventObserver(nullptr, 0u);
+  WindowTreeTestApi(tree).RemoveEventObserver(111u);
   DispatchEventAndAckImmediately(pointer_down);
   ASSERT_EQ(0u, client->tracker()->changes()->size());
 }
 
 // Tests that a client using an event observer does not receive events that
 // don't match the EventMatcher spec.
 TEST_F(WindowTreeTest, SetEventObserverNonMatching) {
   // Create an embedded client.
   TestWindowTreeClient* client = nullptr;
   WindowTree* tree = nullptr;
   ServerWindow* window = nullptr;
   EXPECT_NO_FATAL_FAILURE(SetupEventTargeting(&client, &tree, &window));
 
   // Create an observer for pointer-down events.
-  WindowTreeTestApi(tree).SetEventObserver(
+  WindowTreeTestApi(tree).AddEventObserver(
       CreateEventMatcher(ui::mojom::EventType::POINTER_DOWN), 111u);
 
   // Pointer-up events are not sent to the client, since they don't match.
   DispatchEventAndAckImmediately(CreatePointerUpEvent(5, 5));
   ASSERT_EQ(0u, client->tracker()->changes()->size());
 }
 
 // Tests that an event that both hits a client window and matches an event
 // observer is sent only once to the client.
 TEST_F(WindowTreeTest, SetEventObserverSendsOnce) {
   // Create an embedded client.
   TestWindowTreeClient* client = nullptr;
   WindowTree* tree = nullptr;
   ServerWindow* window = nullptr;
   EXPECT_NO_FATAL_FAILURE(SetupEventTargeting(&client, &tree, &window));
 
   // Create an observer for pointer-up events (which do not cause focus
   // changes).
-  WindowTreeTestApi(tree).SetEventObserver(
+  WindowTreeTestApi(tree).AddEventObserver(
       CreateEventMatcher(ui::mojom::EventType::POINTER_UP), 111u);
 
   // Create an event inside the bounds of the client.
   ui::PointerEvent pointer_up = CreatePointerUpEvent(25, 25);
 
   // The event is dispatched once, with a flag set that it matched the event
   // observer.
   DispatchEventAndAckImmediately(pointer_up);
   ASSERT_EQ(1u, client->tracker()->changes()->size());
   EXPECT_EQ("InputEvent window=2,1 event_action=18 event_observer_id=111",
             SingleChangeToDescription(*client->tracker()->changes()));
 }
 
 // Tests that events generated by user A are not observed by event observers for
 // user B.
 TEST_F(WindowTreeTest, SetEventObserverWrongUser) {
   // Embed a window tree belonging to a different user.
   TestWindowTreeBinding* other_binding;
   WindowTree* other_tree = CreateNewTree("other_user", &other_binding);
   other_binding->client()->tracker()->changes()->clear();
 
   // Set event observers on both the wm tree and the other user's tree.
-  WindowTreeTestApi(wm_tree()).SetEventObserver(
+  WindowTreeTestApi(wm_tree()).AddEventObserver(
       CreateEventMatcher(ui::mojom::EventType::POINTER_UP), 111u);
   WindowTreeTestApi(other_tree)
-      .SetEventObserver(CreateEventMatcher(ui::mojom::EventType::POINTER_UP),
+      .AddEventObserver(CreateEventMatcher(ui::mojom::EventType::POINTER_UP),
                         222u);
 
   // An event is observed by the wm tree, but not by the other user's tree.
   DispatchEventAndAckImmediately(CreatePointerUpEvent(5, 5));
   ASSERT_EQ(1u, wm_client()->tracker()->changes()->size());
   EXPECT_EQ("InputEvent window=0,3 event_action=18 event_observer_id=111",
             SingleChangeToDescription(*wm_client()->tracker()->changes()));
   ASSERT_EQ(0u, other_binding->client()->tracker()->changes()->size());
 }
 
 // Tests that an event observer cannot observe keystrokes.
 TEST_F(WindowTreeTest, SetEventObserverKeyEventsDisallowed) {
-  WindowTreeTestApi(wm_tree()).SetEventObserver(
+  WindowTreeTestApi(wm_tree()).AddEventObserver(
       CreateEventMatcher(ui::mojom::EventType::KEY_PRESSED), 111u);
   ui::KeyEvent key_pressed(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_NONE);
   DispatchEventAndAckImmediately(key_pressed);
   EXPECT_EQ(0u, wm_client()->tracker()->changes()->size());
 
-  WindowTreeTestApi(wm_tree()).SetEventObserver(
+  WindowTreeTestApi(wm_tree()).AddEventObserver(
       CreateEventMatcher(ui::mojom::EventType::KEY_RELEASED), 222u);
   ui::KeyEvent key_released(ui::ET_KEY_RELEASED, ui::VKEY_A, ui::EF_NONE);
   DispatchEventAndAckImmediately(key_released);
   EXPECT_EQ(0u, wm_client()->tracker()->changes()->size());
 }
 
 TEST_F(WindowTreeTest, CursorChangesWhenMouseOverWindowAndWindowSetsCursor) {
   TestWindowTreeClient* embed_client = nullptr;
   WindowTree* tree = nullptr;
   ServerWindow* window = nullptr;
@@ skipping 812 matching lines @@
       kChangeId, kInvalidWindowId, mojom::MoveLoopSource::MOUSE,
       gfx::Point(0, 0));
 
   EXPECT_EQ("ChangeCompleted id=8 sucess=false",
             SingleChangeToDescription(*embed_client->tracker()->changes()));
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui