mus: Change PointerWatcher to observe all pointer events, with moves optional.

services/ui/public/cpp/tests/window_server_test_base.cc

 // Copyright 2015 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/public/cpp/tests/window_server_test_base.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 71 matching lines @@
   most_recent_client_ = root->window_tree();
   EXPECT_TRUE(QuitRunLoop());
   ASSERT_TRUE(window_manager_client_);
   window_manager_client_->AddActivationParent(root);
 }
 
 void WindowServerTestBase::OnDidDestroyClient(WindowTreeClient* client) {
   window_tree_client_destroyed_ = true;
 }
 
-void WindowServerTestBase::OnEventObserved(const ui::Event& event,
-                                           Window* target) {}
+void WindowServerTestBase::OnPointerWatcherEvent(const ui::PointerEvent& event,
+                                                 Window* target) {}
 
 void WindowServerTestBase::SetWindowManagerClient(WindowManagerClient* client) {
   window_manager_client_ = client;
 }
 
 bool WindowServerTestBase::OnWmSetBounds(Window* window, gfx::Rect* bounds) {
   return window_manager_delegate_
              ? window_manager_delegate_->OnWmSetBounds(window, bounds)
              : true;
 }
@@ skipping 49 matching lines @@
              ? window_manager_delegate_->OnAccelerator(accelerator_id, event)
              : mojom::EventResult::UNHANDLED;
 }
 
 void WindowServerTestBase::Create(const shell::Identity& remote_identity,
                                   mojom::WindowTreeClientRequest request) {
   new WindowTreeClient(this, nullptr, std::move(request));
 }
 
 }  // namespace ui