| Index: services/ui/ws/platform_display.cc | 
| diff --git a/services/ui/ws/platform_display.cc b/services/ui/ws/platform_display.cc | 
| index 587e4508e446f6ba96bf234413ab5a9834e06c3b..92ab3dd9f04b63a18e56b5a75f5937987ca63467 100644 | 
| --- a/services/ui/ws/platform_display.cc | 
| +++ b/services/ui/ws/platform_display.cc | 
| @@ -8,7 +8,8 @@ | 
| #include "services/ui/ws/platform_display_default.h" | 
| #include "services/ui/ws/platform_display_factory.h" | 
| #include "services/ui/ws/server_window.h" | 
| -#include "ui/base/cursor/image_cursors.h" | 
| +#include "services/ui/ws/threaded_image_cursors.h" | 
| +#include "services/ui/ws/threaded_image_cursors_factory.h" | 
|  | 
| namespace ui { | 
| namespace ws { | 
| @@ -19,7 +20,8 @@ PlatformDisplayFactory* PlatformDisplay::factory_ = nullptr; | 
| // static | 
| std::unique_ptr<PlatformDisplay> PlatformDisplay::Create( | 
| ServerWindow* root, | 
| -    const display::ViewportMetrics& metrics) { | 
| +    const display::ViewportMetrics& metrics, | 
| +    ThreadedImageCursorsFactory* threaded_image_cursors_factory) { | 
| if (factory_) | 
| return factory_->CreatePlatformDisplay(root, metrics); | 
|  | 
| @@ -28,7 +30,7 @@ std::unique_ptr<PlatformDisplay> PlatformDisplay::Create( | 
| nullptr /* image_cursors */); | 
| #else | 
| return base::MakeUnique<PlatformDisplayDefault>( | 
| -      root, metrics, base::MakeUnique<ImageCursors>()); | 
| +      root, metrics, threaded_image_cursors_factory->CreateCursors()); | 
| #endif | 
| } | 
|  | 
|  |