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

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index da6e1eea60ecc68ac130fc220b9c4d12e223e1e8..9279ac553b847eb4c3496f70872dbd80d9b82cb5 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -863,7 +863,7 @@ WebContents* GetWebContents(int render_process_id, int render_frame_id) {
 #if defined(OS_CHROMEOS)
 std::unique_ptr<service_manager::Service> CreateEmbeddedUIService(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
-    base::WeakPtr<ui::ImageCursors> image_cursors_weak_ptr) {
+    base::WeakPtr<ui::ImageCursorsHolder> image_cursors_weak_ptr) {
   return base::MakeUnique<ui::Service>(task_runner, image_cursors_weak_ptr);
 }
 #endif  // defined(OS_CHROMEOS)
@@ -3047,12 +3047,10 @@ void ChromeContentBrowserClient::RegisterInProcessServices(
     info_ash.task_runner = base::ThreadTaskRunnerHandle::Get();
     services->insert(std::make_pair(ash::mojom::kServiceName, info_ash));
 
-    if (!image_cursors_)
-      image_cursors_ = base::MakeUnique<ui::ImageCursors>();
     service_manager::EmbeddedServiceInfo info_ui;
     info_ui.factory = base::Bind(&CreateEmbeddedUIService,
                                  base::ThreadTaskRunnerHandle::Get(),
-                                 image_cursors_->GetWeakPtr());
+                                 image_cursors_holder_.GetWeakPtr());
     info_ui.use_own_thread = true;
     info_ui.message_loop_type = base::MessageLoop::TYPE_UI;
     info_ui.thread_priority = base::ThreadPriority::DISPLAY;