Updates PointerEventRouter to handle switching move type

services/ui/ws/test_utils.h

 // 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.
 
 #ifndef SERVICES_UI_WS_TEST_UTILS_H_
 #define SERVICES_UI_WS_TEST_UTILS_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 92 matching lines @@
                                  mojom::EventResult::UNHANDLED);
   }
   void EnableCapture() { tree_->event_ack_id_ = 1u; }
   void AckLastEvent(mojom::EventResult result) {
     tree_->OnWindowInputEventAck(tree_->event_ack_id_, result);
   }
   void AckLastAccelerator(mojom::EventResult result) {
     tree_->OnAcceleratorAck(tree_->event_ack_id_, result);
   }
 
-  void StartPointerWatcher(bool want_moves, uint32_t pointer_watcher_id);
+  void StartPointerWatcher(bool want_moves);
   void StopPointerWatcher();
 
  private:
   WindowTree* tree_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeTestApi);
 };
 
 // -----------------------------------------------------------------------------
 
@@ skipping 273 matching lines @@
   void OnWindowOpacityChanged(uint32_t window,
                               float old_opacity,
                               float new_opacity) override;
   void OnWindowParentDrawnStateChanged(uint32_t window, bool drawn) override;
   void OnWindowSharedPropertyChanged(uint32_t window,
                                      const mojo::String& name,
                                      mojo::Array<uint8_t> new_data) override;
   void OnWindowInputEvent(uint32_t event_id,
                           uint32_t window,
                           std::unique_ptr<ui::Event> event,
-                          uint32_t event_observer_id) override;
+                          bool matches_pointer_watcher) override;
   void OnPointerEventObserved(std::unique_ptr<ui::Event> event,
-                              uint32_t event_observer_id,
                               uint32_t window_id) override;
   void OnWindowFocused(uint32_t focused_window_id) override;
   void OnWindowPredefinedCursorChanged(uint32_t window_id,
                                        mojom::Cursor cursor_id) override;
   void OnChangeCompleted(uint32_t change_id, bool success) override;
   void RequestClose(uint32_t window_id) override;
   void GetWindowManager(
       mojo::AssociatedInterfaceRequest<mojom::WindowManager> internal) override;
 
   TestChangeTracker tracker_;
@@ skipping 156 matching lines @@
 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id);
 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree,
                                         ServerWindow* parent,
                                         ClientWindowId* client_id);
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_TEST_UTILS_H_