[views-mus] Support custom cursors.

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 133 matching lines @@
 
 // -----------------------------------------------------------------------------
 
 class DisplayTestApi {
  public:
   explicit DisplayTestApi(Display* display);
   ~DisplayTestApi();
 
   void OnEvent(ui::Event* event) { display_->OnEventFromSource(event); }
 
-  mojom::CursorType last_cursor() const { return display_->last_cursor_; }
+  const ui::CursorData& last_cursor() const { return display_->last_cursor_; }
 
  private:
   Display* display_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayTestApi);
 };
 
 // -----------------------------------------------------------------------------
 
 class EventDispatcherTestApi {
@@ skipping 128 matching lines @@
   const bool automatically_create_display_roots_;
 
   DISALLOW_COPY_AND_ASSIGN(TestDisplayBinding);
 };
 
 // -----------------------------------------------------------------------------
 
 // Factory that dispenses TestPlatformDisplays.
 class TestPlatformDisplayFactory : public PlatformDisplayFactory {
  public:
-  explicit TestPlatformDisplayFactory(mojom::CursorType* cursor_storage);
+  explicit TestPlatformDisplayFactory(ui::CursorData* cursor_storage);
   ~TestPlatformDisplayFactory();
 
   // PlatformDisplayFactory:
   std::unique_ptr<PlatformDisplay> CreatePlatformDisplay(
       ServerWindow* root_window,
       const display::ViewportMetrics& metrics) override;
 
  private:
-  mojom::CursorType* cursor_storage_;
+  ui::CursorData* cursor_storage_;
 
   DISALLOW_COPY_AND_ASSIGN(TestPlatformDisplayFactory);
 };
 
 // -----------------------------------------------------------------------------
 
 class TestWindowManager : public mojom::WindowManager {
  public:
   TestWindowManager();
   ~TestWindowManager() override;
@@ skipping 160 matching lines @@
       const base::Optional<std::vector<uint8_t>>& new_data) override;
   void OnWindowInputEvent(uint32_t event_id,
                           uint32_t window,
                           int64_t display_id,
                           std::unique_ptr<ui::Event> event,
                           bool matches_pointer_watcher) override;
   void OnPointerEventObserved(std::unique_ptr<ui::Event> event,
                               uint32_t window_id,
                               int64_t display_id) override;
   void OnWindowFocused(uint32_t focused_window_id) override;
-  void OnWindowPredefinedCursorChanged(uint32_t window_id,
-                                       mojom::CursorType cursor_id) override;
+  void OnWindowCursorChanged(uint32_t window_id,
+                             ui::CursorData cursor) override;
   void OnWindowSurfaceChanged(Id window_id,
                               const cc::SurfaceInfo& surface_info) override;
   void OnDragDropStart(
       const std::unordered_map<std::string, std::vector<uint8_t>>& mime_data)
       override;
   void OnDragEnter(uint32_t window,
                    uint32_t key_state,
                    const gfx::Point& position,
                    uint32_t effect_bitmask,
                    const OnDragEnterCallback& callback) override;
@@ skipping 110 matching lines @@
 // -----------------------------------------------------------------------------
 
 // Helper class which creates and sets up the necessary objects for tests that
 // use the WindowServer.
 class WindowServerTestHelper {
  public:
   WindowServerTestHelper();
   ~WindowServerTestHelper();
 
   WindowServer* window_server() { return window_server_.get(); }
-  mojom::CursorType cursor() const { return cursor_id_; }
+  ui::CursorData cursor() const { return cursor_; }
 
   TestWindowServerDelegate* window_server_delegate() {
     return &window_server_delegate_;
   }
 
  private:
-  mojom::CursorType cursor_id_;
+  ui::CursorData cursor_;
   TestPlatformDisplayFactory platform_display_factory_;
   TestWindowServerDelegate window_server_delegate_;
   std::unique_ptr<WindowServer> window_server_;
   std::unique_ptr<base::MessageLoop> message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowServerTestHelper);
 };
 
 // -----------------------------------------------------------------------------
 
@@ skipping 15 matching lines @@
   // |window_bounds|.
   // TODO(sky): rename and cleanup. This doesn't really create a new tree.
   void CreateSecondaryTree(ServerWindow* embed_window,
                            const gfx::Rect& window_bounds,
                            TestWindowTreeClient** out_client,
                            WindowTree** window_tree,
                            ServerWindow** window);
   // Sets the task runner for |message_loop_|
   void SetTaskRunner(scoped_refptr<base::SingleThreadTaskRunner> task_runner);
 
-  mojom::CursorType cursor() const { return ws_test_helper_.cursor(); }
+  ui::CursorType cursor_type() const {
+    return ws_test_helper_.cursor().cursor_type();
+  }
   Display* display() { return display_; }
   TestWindowTreeBinding* last_binding() {
     return ws_test_helper_.window_server_delegate()->last_binding();
   }
   TestWindowTreeClient* last_window_tree_client() {
     return ws_test_helper_.window_server_delegate()->last_client();
   }
   TestWindowTreeClient* wm_client() { return wm_client_; }
   WindowServer* window_server() { return ws_test_helper_.window_server(); }
 
@@ skipping 46 matching lines @@
                               ClientWindowId* client_id = nullptr);
 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree,
                                         ServerWindow* parent,
                                         ClientWindowId* client_id = nullptr);
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_TEST_UTILS_H_