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

services/ui/ws/platform_display_default_unittest.cc

 // Copyright 2017 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.
 
 #include "services/ui/ws/platform_display_default.h"
 
 #include "base/time/time.h"
+#include "services/ui/common/image_cursors_set.h"
+#include "services/ui/ws/threaded_image_cursors.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/cursor/image_cursors.h"
 #include "ui/display/types/native_display_delegate.h"
 #include "ui/events/event.h"
 #include "ui/events/event_sink.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/ozone/public/system_input_injector.h"
 #include "ui/platform_window/platform_window.h"
 #include "ui/platform_window/stub/stub_window.h"
 
 namespace ui {
@@ skipping 77 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestOzonePlatform);
 };
 
 // Test fails in part because services_unittests appears to have its own ozone
 // platform that it initializes. For some reason, this only started failing
 // locally and on the trybots on 06/13/2017, while passing when run on the CQ
 // and the builders. crbug.com/732987
 TEST(PlatformDisplayDefaultTest, DISABLED_EventDispatch) {
+  // ThreadTaskRunnerHandle needed required by ThreadedImageCursors.
+  base::MessageLoop loop;
   // Setup ozone so the display can be initialized.
   TestOzonePlatform platform;
 
   // Create the display.
   display::ViewportMetrics metrics;
   metrics.bounds_in_pixels = gfx::Rect(1024, 768);
   metrics.device_scale_factor = 1.f;
   metrics.ui_scale_factor = 1.f;
+  scoped_refptr<base::SingleThreadTaskRunner> task_runner =
+      base::ThreadTaskRunnerHandle::Get();
+  ImageCursorsSet image_cursors_set;
+  std::unique_ptr<ThreadedImageCursors> threaded_image_cursors =
+      base::MakeUnique<ThreadedImageCursors>(task_runner,
+                                             image_cursors_set.GetWeakPtr());
   PlatformDisplayDefault display(nullptr, metrics,
-                                 std::unique_ptr<ImageCursors>());
+                                 std::move(threaded_image_cursors));
 
   // Initialize the display with a test EventSink so we can sense events.
   TestEventSink event_sink;
   TestPlatformDisplayDelegate delegate(&event_sink, &platform);
   display.Init(&delegate);
 
   // Event dispatch is handled at the PlatformWindowDelegate level.
   PlatformWindowDelegate* display_for_dispatch =
       static_cast<PlatformWindowDelegate*>(&display);
 
@@ skipping 21 matching lines @@
   // Releasing the key dispatches exactly one event.
   KeyEvent key_released(ET_KEY_RELEASED, VKEY_A, EF_NONE);
   display_for_dispatch->DispatchEvent(&key_released);
   EXPECT_EQ(1, event_sink.count_);
   EXPECT_EQ(ET_KEY_RELEASED, event_sink.last_event_type_);
 }
 
 }  // namespace
 }  // namespace ws
 }  // namespace ui