Move Mus into chrome's process when running with --mus.

services/ui/ws/platform_display_default.h

Index: services/ui/ws/platform_display_default.h
diff --git a/services/ui/ws/platform_display_default.h b/services/ui/ws/platform_display_default.h
index 5f942b19f973c61807a6d5b7053a3196bfe136ef..51263e0896e43fa13fa7886c7e60e89c35544522 100644
--- a/services/ui/ws/platform_display_default.h
+++ b/services/ui/ws/platform_display_default.h
@@ -18,11 +18,12 @@
 namespace ui {
 
 class EventSink;
-class ImageCursors;
 class PlatformWindow;
 
 namespace ws {
 
+class ThreadedImageCursors;
+
 // PlatformDisplay implementation that connects to a PlatformWindow and
 // FrameGenerator for Chrome OS.
 class PlatformDisplayDefault : public PlatformDisplay,
@@ -31,7 +32,7 @@ class PlatformDisplayDefault : public PlatformDisplay,
   // |image_cursors| may be null, for example on Android or in tests.
   PlatformDisplayDefault(ServerWindow* root_window,
                          const display::ViewportMetrics& metrics,
-                         std::unique_ptr<ImageCursors> image_cursors);
+                         std::unique_ptr<ThreadedImageCursors> image_cursors);
   ~PlatformDisplayDefault() override;
 
   // EventSource::
@@ -67,7 +68,7 @@ class PlatformDisplayDefault : public PlatformDisplay,
 
   ServerWindow* root_window_;
 
-  std::unique_ptr<ui::ImageCursors> image_cursors_;
+  std::unique_ptr<ThreadedImageCursors> image_cursors_;
 
   PlatformDisplayDelegate* delegate_ = nullptr;
   std::unique_ptr<FrameGenerator> frame_generator_;