Updates PointerEventRouter to handle switching move type

services/ui/public/cpp/tests/test_window_tree.h

 // 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.
 
 #ifndef SERVICES_UI_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_H_
 #define SERVICES_UI_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_H_
 
 #include <stdint.h>
 
 #include <set>
@@ skipping 60 matching lines @@
                                        uint32_t window_id) override;
   void SetModal(uint32_t change_id, uint32_t window_id) override;
   void ReorderWindow(uint32_t change_id,
                      uint32_t window_id,
                      uint32_t relative_window_id,
                      mojom::OrderDirection direction) override;
   void GetWindowTree(uint32_t window_id,
                      const GetWindowTreeCallback& callback) override;
   void SetCapture(uint32_t change_id, uint32_t window_id) override;
   void ReleaseCapture(uint32_t change_id, uint32_t window_id) override;
-  void StartPointerWatcher(bool want_moves,
-                           uint32_t pointer_watcher_id) override;
+  void StartPointerWatcher(bool want_moves) override;
   void StopPointerWatcher() override;
   void Embed(uint32_t window_id,
              mojom::WindowTreeClientPtr client,
              uint32_t flags,
              const EmbedCallback& callback) override;
   void SetFocus(uint32_t change_id, uint32_t window_id) override;
   void SetCanFocus(uint32_t window_id, bool can_focus) override;
   void SetCanAcceptEvents(uint32_t window_id, bool can_accept_events) override;
   void SetPredefinedCursor(uint32_t change_id,
                            uint32_t window_id,
@@ skipping 20 matching lines @@
   uint32_t change_id_;
   std::set<uint32_t> acked_events_;
   uint32_t window_id_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWindowTree);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_H_