[views-mus] Support custom cursors.

services/ui/ws/test_change_tracker.h

 // 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.
 
 #ifndef SERVICES_UI_WS_TEST_CHANGE_TRACKER_H_
 #define SERVICES_UI_WS_TEST_CHANGE_TRACKER_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 71 matching lines @@
   cc::FrameSinkId frame_sink_id;
   base::Optional<cc::LocalSurfaceId> local_surface_id;
   int32_t event_action;
   bool matches_pointer_watcher;
   std::string embed_url;
   mojom::OrderDirection direction;
   bool bool_value;
   float float_value;
   std::string property_key;
   std::string property_value;
-  int32_t cursor_id;
+  ui::CursorType cursor_type;
   uint32_t change_id;
   cc::SurfaceId surface_id;
   gfx::Size frame_size;
   float device_scale_factor;
   // Set in OnWindowInputEvent() if the event is a KeyEvent.
   std::unordered_map<std::string, std::vector<uint8_t>> key_event_properties;
 };
 
 // Converts Changes to string descriptions.
 std::vector<std::string> ChangesToDescription1(
@@ skipping 69 matching lines @@
   void OnWindowInputEvent(Id window_id,
                           const ui::Event& event,
                           bool matches_pointer_watcher);
   void OnPointerEventObserved(const ui::Event& event,
                               uint32_t window_id);
   void OnWindowSharedPropertyChanged(
       Id window_id,
       const std::string& name,
       const base::Optional<std::vector<uint8_t>>& data);
   void OnWindowFocused(Id window_id);
-  void OnWindowPredefinedCursorChanged(Id window_id,
-                                       mojom::CursorType cursor_id);
+  void OnWindowCursorChanged(Id window_id, const ui::CursorData& cursor);
   void OnChangeCompleted(uint32_t change_id, bool success);
   void OnTopLevelCreated(uint32_t change_id,
                          mojom::WindowDataPtr window_data,
                          bool drawn,
                          const cc::FrameSinkId& frame_sink_id);
   void OnWindowSurfaceChanged(Id window_id,
                               const cc::SurfaceInfo& surface_info);
 
  private:
   void AddChange(const Change& change);
 
   Delegate* delegate_;
   std::vector<Change> changes_;
 
   DISALLOW_COPY_AND_ASSIGN(TestChangeTracker);
 };
 
 }  // namespace ws
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_TEST_CHANGE_TRACKER_H_