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

services/ui/ws/test_change_tracker.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/test_change_tracker.h"
 
 #include <stddef.h>
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 88 matching lines @@
       return base::StringPrintf("DrawnStateChanged window=%s drawn=%s",
                                 WindowIdToString(change.window_id).c_str(),
                                 change.bool_value ? "true" : "false");
 
     case CHANGE_TYPE_INPUT_EVENT: {
       std::string result = base::StringPrintf(
           "InputEvent window=%s event_action=%d",
           WindowIdToString(change.window_id).c_str(), change.event_action);
       if (change.matches_pointer_watcher)
         result += " matches_pointer_watcher";
+      if (!change.event_root_location.IsOrigin()) {
+        result +=
+            base::StringPrintf(" event_root_location=%s",
+                               change.event_root_location.ToString().c_str());
+      }
       return result;
     }
 
     case CHANGE_TYPE_POINTER_WATCHER_EVENT:
       return base::StringPrintf("PointerWatcherEvent event_action=%d window=%s",
                                 change.event_action,
                                 WindowIdToString(change.window_id).c_str());
 
     case CHANGE_TYPE_PROPERTY_CHANGED:
       return base::StringPrintf("PropertyChanged window=%s key=%s value=%s",
@@ skipping 239 matching lines @@
 }
 
 void TestChangeTracker::OnWindowInputEvent(Id window_id,
                                            const ui::Event& event,
                                            bool matches_pointer_watcher) {
   Change change;
   change.type = CHANGE_TYPE_INPUT_EVENT;
   change.window_id = window_id;
   change.event_action = static_cast<int32_t>(event.type());
   change.matches_pointer_watcher = matches_pointer_watcher;
+  if (event.IsLocatedEvent())
+    change.event_root_location = event.AsLocatedEvent()->root_location();
   AddChange(change);
 }
 
 void TestChangeTracker::OnPointerEventObserved(const ui::Event& event,
                                                uint32_t window_id) {
   Change change;
   change.type = CHANGE_TYPE_POINTER_WATCHER_EVENT;
   change.event_action = static_cast<int32_t>(event.type());
   change.window_id = window_id;
   AddChange(change);
@@ skipping 82 matching lines @@
 
 std::string TestWindow::ToString2() const {
   return base::StringPrintf(
       "window=%s parent=%s visible=%s", WindowIdToString(window_id).c_str(),
       WindowIdToString(parent_id).c_str(), visible ? "true" : "false");
 }
 
 }  // namespace ws
 
 }  // namespace ui