Updates PointerEventRouter to handle switching move type

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 304 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 watched before starting a watcher.
   DispatchEventAndAckImmediately(pointer_down);
   ASSERT_EQ(0u, client->tracker()->changes()->size());
 
   // Create a watcher for all events excluding move events.
-  WindowTreeTestApi(tree).StartPointerWatcher(false, 111u);
+  WindowTreeTestApi(tree).StartPointerWatcher(false);
 
   // Pointer-down events are sent to the client.
   DispatchEventAndAckImmediately(pointer_down);
   ASSERT_EQ(1u, client->tracker()->changes()->size());
-  EXPECT_EQ(
-      "PointerWatcherEvent event_action=16 pointer_watcher_id=111 window=null",
-      ChangesToDescription1(*client->tracker()->changes())[0]);
+  EXPECT_EQ("PointerWatcherEvent event_action=16 window=null",
+            ChangesToDescription1(*client->tracker()->changes())[0]);
   client->tracker()->changes()->clear();
 
   // Stopping the watcher stops sending events to the client.
   WindowTreeTestApi(tree).StopPointerWatcher();
   DispatchEventAndAckImmediately(pointer_down);
   ASSERT_EQ(0u, client->tracker()->changes()->size());
 }
 
 // Verifies PointerWatcher sees windows known to it.
 TEST_F(WindowTreeTest, PointerWatcherGetsWindow) {
   // Create an embedded client.
   TestWindowTreeClient* client = nullptr;
   WindowTree* tree = nullptr;
   ServerWindow* window = nullptr;
   EXPECT_NO_FATAL_FAILURE(SetupEventTargeting(&client, &tree, &window));
 
-  WindowTreeTestApi(wm_tree()).StartPointerWatcher(false, 111u);
+  WindowTreeTestApi(wm_tree()).StartPointerWatcher(false);
 
   // Create and dispatch an event that targets the embedded window.
   ui::PointerEvent pointer_down = CreatePointerDownEvent(25, 25);
   DispatchEventAndAckImmediately(pointer_down);
 
   // Expect two changes, the first is focus, the second the pointer watcher
   // event.
   ASSERT_EQ(2u, wm_client()->tracker()->changes()->size());
   EXPECT_EQ(
-      "PointerWatcherEvent event_action=16 pointer_watcher_id=111 window=" +
+      "PointerWatcherEvent event_action=16 window=" +
           ClientWindowIdToString(ClientWindowIdForWindow(wm_tree(), window)),
       ChangesToDescription1(*wm_client()->tracker()->changes())[1]);
 }
 
 // Tests that a client using a pointer watcher does not receive events that
 // don't match the |want_moves| setting.
 TEST_F(WindowTreeTest, StartPointerWatcherNonMatching) {
   // Create an embedded client.
   TestWindowTreeClient* client = nullptr;
   WindowTree* tree = nullptr;
   ServerWindow* window = nullptr;
   EXPECT_NO_FATAL_FAILURE(SetupEventTargeting(&client, &tree, &window));
 
   // Create a watcher for all events excluding move events.
-  WindowTreeTestApi(tree).StartPointerWatcher(false, 111u);
+  WindowTreeTestApi(tree).StartPointerWatcher(false);
 
   // Pointer-move events are not sent to the client, since they don't match.
   DispatchEventAndAckImmediately(CreateMouseMoveEvent(5, 5));
   ASSERT_EQ(0u, client->tracker()->changes()->size());
 }
 
 // Tests that an event that both hits a client window and matches a pointer
 // watcher is sent only once to the client.
 TEST_F(WindowTreeTest, StartPointerWatcherSendsOnce) {
   // Create an embedded client.
   TestWindowTreeClient* client = nullptr;
   WindowTree* tree = nullptr;
   ServerWindow* window = nullptr;
   EXPECT_NO_FATAL_FAILURE(SetupEventTargeting(&client, &tree, &window));
 
   // Create a watcher for all events excluding move events (which do not
   // cause focus changes).
-  WindowTreeTestApi(tree).StartPointerWatcher(false, 111u);
+  WindowTreeTestApi(tree).StartPointerWatcher(false);
 
   // 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 pointer
   // watcher.
   DispatchEventAndAckImmediately(pointer_up);
   ASSERT_EQ(1u, client->tracker()->changes()->size());
-  EXPECT_EQ("InputEvent window=2,1 event_action=18 pointer_watcher_id=111",
+  EXPECT_EQ("InputEvent window=2,1 event_action=18 matches_pointer_watcher",
             SingleChangeToDescription(*client->tracker()->changes()));
 }
 
 // Tests that events generated by user A are not watched by pointer watchers
 // for user B.
 TEST_F(WindowTreeTest, StartPointerWatcherWrongUser) {
   // 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 pointer watchers on both the wm tree and the other user's tree.
-  WindowTreeTestApi(wm_tree()).StartPointerWatcher(false, 111u);
-  WindowTreeTestApi(other_tree).StartPointerWatcher(false, 222u);
+  WindowTreeTestApi(wm_tree()).StartPointerWatcher(false);
+  WindowTreeTestApi(other_tree).StartPointerWatcher(false);
 
   // An event is watched 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 pointer_watcher_id=111",
+  EXPECT_EQ("InputEvent window=0,3 event_action=18 matches_pointer_watcher",
             SingleChangeToDescription(*wm_client()->tracker()->changes()));
   ASSERT_EQ(0u, other_binding->client()->tracker()->changes()->size());
 }
 
 // Tests that a pointer watcher cannot watch keystrokes.
 TEST_F(WindowTreeTest, StartPointerWatcherKeyEventsDisallowed) {
-  WindowTreeTestApi(wm_tree()).StartPointerWatcher(false, 111u);
+  WindowTreeTestApi(wm_tree()).StartPointerWatcher(false);
   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()).StartPointerWatcher(false, 222u);
+  WindowTreeTestApi(wm_tree()).StartPointerWatcher(false);
   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;
   EXPECT_NO_FATAL_FAILURE(SetupEventTargeting(&embed_client, &tree, &window));
@@ skipping 873 matching lines @@
       ClientWindowIdForWindow(owning_tree, FirstRoot(embed_tree))));
   EXPECT_TRUE(wm_client()->tracker()->changes()->empty());
   ASSERT_TRUE(!embed_client->tracker()->changes()->empty());
   EXPECT_EQ("OnCaptureChanged new_window=null old_window=1,1",
             ChangesToDescription1(*embed_client->tracker()->changes())[0]);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui