WIP fix for Ozone cursor woes in Mushrome: Numéro deux

services/ui/service.h

Index: services/ui/service.h
diff --git a/services/ui/service.h b/services/ui/service.h
index 9168aa69788acbc896deb1d2cc8bf8f83e3a2537..dd887c270eb0a7a3bad666b12a6cf0fe8c649c73 100644
--- a/services/ui/service.h
+++ b/services/ui/service.h
@@ -53,7 +53,7 @@ class Identity;
 
 namespace ui {
 
-class ImageCursors;
+class ImageCursorsHolder;
 class InputDeviceController;
 class PlatformEventSource;
 
@@ -72,7 +72,7 @@ class Service : public service_manager::Service,
   // |image_cursors_weak_ptr| is also only used when the UI service runs
   // in-process. It can only be dereferenced on |resource_runner|.
   Service(scoped_refptr<base::SingleThreadTaskRunner> resource_runner,
-          base::WeakPtr<ui::ImageCursors> image_cursors_weak_ptr);
+          base::WeakPtr<ui::ImageCursorsHolder> image_cursors_holder_weak_ptr);
   ~Service() override;
 
  private:
@@ -111,7 +111,7 @@ class Service : public service_manager::Service,
   void OnWillCreateTreeForWindowManager(
       bool automatically_create_display_roots) override;
   scoped_refptr<base::SingleThreadTaskRunner>& GetResourceRunner() override;
-  base::WeakPtr<ui::ImageCursors> GetImageCursorsWeakPtr() override;
+  base::WeakPtr<ui::ImageCursorsHolder> GetImageCursorsHolderWeakPtr() override;
 
   void BindAccessibilityManagerRequest(
       const service_manager::BindSourceInfo& source_info,
@@ -184,10 +184,10 @@ class Service : public service_manager::Service,
   // Used when UI Service runs in-process, and can only be de-referenced on
   // |resource_runner_|. When UI Service doesn't run in-process, this points to
   // |image_cursors_| (and should be de-referenced on UI Serivice's thread).
-  base::WeakPtr<ui::ImageCursors> image_cursors_weak_ptr_;
+  base::WeakPtr<ui::ImageCursorsHolder> image_cursors_holder_weak_ptr_;
 
   // Used when UI Service doesn't run in-process.
-  std::unique_ptr<ui::ImageCursors> image_cursors_;
+  std::unique_ptr<ui::ImageCursorsHolder> image_cursors_holder_;
 
   bool test_config_;
 #if defined(USE_OZONE)