Make chrome --mus run the UI Service inside the browser process.

chrome/browser/browser_process_platform_part_chromeos.cc

 // Copyright (c) 2013 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 "chrome/browser/browser_process_platform_part_chromeos.h"
 
 #include "ash/public/interfaces/constants.mojom.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/time/default_tick_clock.h"
@@ skipping 26 matching lines @@
 #include "chromeos/geolocation/simple_geolocation_provider.h"
 #include "chromeos/timezone/timezone_resolver.h"
 #include "components/session_manager/core/session_manager.h"
 #include "components/user_manager/user_manager.h"
 #include "mash/public/interfaces/launchable.mojom.h"
 #include "services/preferences/public/interfaces/preferences.mojom.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/ui/public/interfaces/constants.mojom.h"
+#include "services/ui/service.h"
 
 #if defined(USE_OZONE)
 #include "content/public/common/service_manager_connection.h"
 #include "services/service_manager/runner/common/client_util.h"
 #include "services/ui/public/cpp/input_devices/input_device_controller.h"
 #include "services/ui/public/cpp/input_devices/input_device_controller_client.h"
 #include "services/ui/public/interfaces/constants.mojom.h"
 #endif
 
 namespace {
@@ skipping 65 matching lines @@
 
   service_manager::BinderRegistry interfaces_;
   mojo::BindingSet<mash::mojom::Launchable> bindings_;
 #if defined(USE_OZONE)
   ui::InputDeviceController input_device_controller_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ChromeServiceChromeOS);
 };
 
+std::unique_ptr<service_manager::Service> CreateEmbeddedUIService(
+    const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
+    base::WeakPtr<ui::ImageCursorsSet> image_cursors_set_weak_ptr) {
+  ui::Service::InProcessConfig config;
+  config.resource_runner = task_runner;
+  config.image_cursors_set_weak_ptr = image_cursors_set_weak_ptr;
+  return base::MakeUnique<ui::Service>(&config);
+}
+
 }  // namespace
 
 BrowserProcessPlatformPart::BrowserProcessPlatformPart()
     : created_profile_helper_(false) {}
 
 BrowserProcessPlatformPart::~BrowserProcessPlatformPart() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 }
 
 void BrowserProcessPlatformPart::InitializeAutomaticRebootManager() {
@@ skipping 125 matching lines @@
     services->insert(std::make_pair(prefs::mojom::kForwarderServiceName, info));
   }
 
   if (!ash_util::IsRunningInMash()) {
     service_manager::EmbeddedServiceInfo info;
     info.factory = base::Bind(&ash_util::CreateEmbeddedAshService,
                               base::ThreadTaskRunnerHandle::Get());
     info.task_runner = base::ThreadTaskRunnerHandle::Get();
     services->insert(std::make_pair(ash::mojom::kServiceName, info));
   }
+
+  if (chromeos::GetAshConfig() == ash::Config::MUS) {

[sky, 2017/07/13 20:37:20]

This certainly works for mushrome, but given we want mus to run in ash in mash
I'm wondering if this code should live in ash?

+    service_manager::EmbeddedServiceInfo info;
+    info.factory = base::Bind(&CreateEmbeddedUIService,
+                              base::ThreadTaskRunnerHandle::Get(),
+                              image_cursors_set_.GetWeakPtr());
+    info.use_own_thread = true;
+    info.message_loop_type = base::MessageLoop::TYPE_UI;
+    info.thread_priority = base::ThreadPriority::DISPLAY;
+    services->insert(std::make_pair(ui::mojom::kServiceName, info));
+  }
 }
 
 chromeos::system::SystemClock* BrowserProcessPlatformPart::GetSystemClock() {
   if (!system_clock_.get())
     system_clock_.reset(new chromeos::system::SystemClock());
   return system_clock_.get();
 }
 
 void BrowserProcessPlatformPart::DestroySystemClock() {
   system_clock_.reset();
@@ skipping 24 matching lines @@
   }
   return input_device_controller_client_.get();
 }
 #endif
 
 void BrowserProcessPlatformPart::CreateProfileHelper() {
   DCHECK(!created_profile_helper_ && !profile_helper_);
   created_profile_helper_ = true;
   profile_helper_.reset(new chromeos::ProfileHelper());
 }