Updates PointerEventRouter to handle switching move type

services/ui/ws/test_utils.cc

 // Copyright 2016 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_utils.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "cc/output/copy_output_request.h"
@@ skipping 132 matching lines @@
 
 const ViewportMetrics& TestFrameGeneratorDelegate::GetViewportMetrics() {
   return metrics_;
 }
 
 // WindowTreeTestApi  ---------------------------------------------------------
 
 WindowTreeTestApi::WindowTreeTestApi(WindowTree* tree) : tree_(tree) {}
 WindowTreeTestApi::~WindowTreeTestApi() {}
 
-void WindowTreeTestApi::StartPointerWatcher(bool want_moves,
-                                            uint32_t pointer_watcher_id) {
-  tree_->StartPointerWatcher(want_moves, pointer_watcher_id);
+void WindowTreeTestApi::StartPointerWatcher(bool want_moves) {
+  tree_->StartPointerWatcher(want_moves);
 }
 
 void WindowTreeTestApi::StopPointerWatcher() {
   tree_->StopPointerWatcher();
 }
 
 // DisplayTestApi  ------------------------------------------------------------
 
 DisplayTestApi::DisplayTestApi(Display* display) : display_(display) {}
 DisplayTestApi::~DisplayTestApi() {}
@@ skipping 157 matching lines @@
 void TestWindowTreeClient::OnWindowSharedPropertyChanged(
     uint32_t window,
     const mojo::String& name,
     mojo::Array<uint8_t> new_data) {
   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);
+                                              bool matches_pointer_watcher) {
+  tracker_.OnWindowInputEvent(window, *event.get(), matches_pointer_watcher);
 }
 
 void TestWindowTreeClient::OnPointerEventObserved(
     std::unique_ptr<ui::Event> event,
-    uint32_t event_observer_id,
     uint32_t window_id) {
-  tracker_.OnPointerEventObserved(*event.get(), event_observer_id, window_id);
+  tracker_.OnPointerEventObserved(*event.get(), window_id);
 }
 
 void TestWindowTreeClient::OnWindowFocused(uint32_t focused_window_id) {
   tracker_.OnWindowFocused(focused_window_id);
 }
 
 void TestWindowTreeClient::OnWindowPredefinedCursorChanged(
     uint32_t window_id,
     mojom::Cursor cursor_id) {
   tracker_.OnWindowPredefinedCursorChanged(window_id, cursor_id);
@@ skipping 192 matching lines @@
     return nullptr;
   if (!tree->AddWindow(parent_client_id, client_window_id))
     return nullptr;
   *client_id = client_window_id;
   return tree->GetWindowByClientId(client_window_id);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui