Change OnWindowInputEvent to use display_id to find the host and update event root_location in WS.

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 270 matching lines @@
   DispatchEventAndAckImmediately(CreatePointerUpEvent(21, 22));
   wm_client()->tracker()->changes()->clear();
   tree1_client->tracker()->changes()->clear();
 
   // Press in the same location. Should not get a focus change event (only input
   // event).
   DispatchEventAndAckImmediately(CreatePointerDownEvent(61, 22));
   EXPECT_EQ(child1, display()->GetFocusedWindow());
   ASSERT_EQ(1u, wm_client()->tracker()->changes()->size())
       << SingleChangeToDescription(*wm_client()->tracker()->changes());
-  EXPECT_EQ("InputEvent window=0,3 event_action=16",
+  EXPECT_EQ("InputEvent window=0,3 event_action=16 event_root_location=61,22",
             ChangesToDescription1(*wm_client()->tracker()->changes())[0]);
   EXPECT_TRUE(tree1_client->tracker()->changes()->empty());
 }
 
 TEST_F(WindowTreeTest, BasicInputEventTarget) {
   TestWindowTreeClient* embed_client = nullptr;
   WindowTree* tree = nullptr;
   ServerWindow* window = nullptr;
   EXPECT_NO_FATAL_FAILURE(
       SetupEventTargeting(&embed_client, &tree, &window));
 
   // Send an event to |v1|. |embed_client| should get the event, not
   // |wm_client|, since |v1| lives inside an embedded window.
   DispatchEventAndAckImmediately(CreatePointerDownEvent(21, 22));
   ASSERT_EQ(1u, wm_client()->tracker()->changes()->size());
   EXPECT_EQ("Focused id=2,1",
             ChangesToDescription1(*wm_client()->tracker()->changes())[0]);
   ASSERT_EQ(2u, embed_client->tracker()->changes()->size());
   EXPECT_EQ("Focused id=2,1",
             ChangesToDescription1(*embed_client->tracker()->changes())[0]);
-  EXPECT_EQ("InputEvent window=2,1 event_action=16",
+  EXPECT_EQ("InputEvent window=2,1 event_action=16 event_root_location=21,22",
             ChangesToDescription1(*embed_client->tracker()->changes())[1]);
 }
 
 // Tests that a client can watch for events outside its bounds.
 TEST_F(WindowTreeTest, StartPointerWatcher) {
   // Create an embedded client.
   TestWindowTreeClient* client = nullptr;
   WindowTree* tree = nullptr;
   ServerWindow* window = nullptr;
   EXPECT_NO_FATAL_FAILURE(SetupEventTargeting(&client, &tree, &window));
@@ skipping 95 matching lines @@
   // cause focus changes).
   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 matches_pointer_watcher",
-            SingleChangeToDescription(*client->tracker()->changes()));
+  EXPECT_EQ(
+      "InputEvent window=2,1 event_action=18 matches_pointer_watcher"
+      " event_root_location=25,25",
+      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();
 
@@ skipping 201 matching lines @@
   ServerWindow* wm_root = FirstRoot(wm_tree());
   ASSERT_TRUE(wm_root);
   wm_root->SetBounds(gfx::Rect(0, 0, 100, 100));
   // This tests expects |wm_root| to be a possible target.
   wm_root->set_event_targeting_policy(
       mojom::EventTargetingPolicy::TARGET_AND_DESCENDANTS);
 
   wm_client()->tracker()->changes()->clear();
   DispatchEventWithoutAck(CreateMouseMoveEvent(21, 22));
   ASSERT_EQ(1u, wm_client()->tracker()->changes()->size());
-  EXPECT_EQ("InputEvent window=0,3 event_action=17",
+  EXPECT_EQ("InputEvent window=0,3 event_action=17 event_root_location=21,22",
             ChangesToDescription1(*wm_client()->tracker()->changes())[0]);
   wm_client()->tracker()->changes()->clear();
 
   // Send another event. This event shouldn't reach the client.
   DispatchEventWithoutAck(CreateMouseMoveEvent(21, 22));
   ASSERT_EQ(0u, wm_client()->tracker()->changes()->size());
 
   // Ack the first event. That should trigger the dispatch of the second event.
   AckPreviousEvent();
   ASSERT_EQ(1u, wm_client()->tracker()->changes()->size());
-  EXPECT_EQ("InputEvent window=0,3 event_action=17",
+  EXPECT_EQ("InputEvent window=0,3 event_action=17 event_root_location=21,22",
             ChangesToDescription1(*wm_client()->tracker()->changes())[0]);
 }
 
 // Establish client, call NewTopLevelWindow(), make sure get id, and make
 // sure client paused.
 TEST_F(WindowTreeTest, NewTopLevelWindow) {
   TestWindowManager wm_internal;
   set_window_manager_internal(wm_tree(), &wm_internal);
 
   TestWindowTreeBinding* child_binding;
@@ skipping 748 matching lines @@
     client->tracker()->changes()->clear();
   }
 
   // Client should not have got any messages after shutdown.
   EXPECT_TRUE(client->tracker()->changes()->empty());
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui