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

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 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/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 240 matching lines @@
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
 #include "chromeos/chromeos_constants.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/user_manager/user_manager.h"
 #include "mash/public/interfaces/launchable.mojom.h"
 #include "services/service_manager/public/interfaces/interface_provider_spec.mojom.h"
+#include "services/ui/public/interfaces/constants.mojom.h"
+#include "services/ui/service.h"
+#include "ui/base/cursor/image_cursors.h"
 #elif defined(OS_LINUX)
 #include "chrome/browser/chrome_browser_main_linux.h"
 #elif defined(OS_ANDROID)
 #include "chrome/browser/android/app_hooks.h"
 #include "chrome/browser/android/chrome_context_util.h"
 #include "chrome/browser/android/devtools_manager_delegate_android.h"
 #include "chrome/browser/android/ntp/new_tab_page_url_handler.h"
 #include "chrome/browser/android/service_tab_launcher.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
@@ skipping 580 matching lines @@
          base::FieldTrialList::FindFullName("SaveDataHeader")
              .compare("Disabled");
 }
 
 WebContents* GetWebContents(int render_process_id, int render_frame_id) {
   RenderFrameHost* rfh =
       RenderFrameHost::FromID(render_process_id, render_frame_id);
   return WebContents::FromRenderFrameHost(rfh);
 }
 
+#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) {
+  return base::MakeUnique<ui::Service>(task_runner, image_cursors_weak_ptr);
+}
+#endif  // defined(OS_CHROMEOS)
+
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 // Returns true if there is is an extension with the same origin as
 // |source_origin| in |opener_render_process_id| with
 // APIPermission::kBackground.
 bool SecurityOriginHasExtensionBackgroundPermission(
     extensions::ProcessMap* process_map,
     extensions::ExtensionRegistry* registry,
     const GURL& source_origin,
     int opener_render_process_id) {
   // Note: includes web URLs that are part of an extension's web extent.
@@ skipping 2152 matching lines @@
     content::ServiceInfo info;
     info.factory = base::Bind([] {
       return std::unique_ptr<service_manager::Service>(
           base::MakeUnique<ActiveProfilePrefService>());
     });
     info.task_runner = base::ThreadTaskRunnerHandle::Get();
     services->insert(std::make_pair(prefs::mojom::kForwarderServiceName, info));
   }
 
   if (!ash_util::IsRunningInMash()) {
-    content::ServiceInfo 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));
+    content::ServiceInfo info_ash;
+    info_ash.factory = base::Bind(&ash_util::CreateEmbeddedAshService,
+                                  base::ThreadTaskRunnerHandle::Get());
+    info_ash.task_runner = base::ThreadTaskRunnerHandle::Get();
+    services->insert(std::make_pair(ash::mojom::kServiceName, info_ash));
+
+    if (!image_cursors_)

[sky, 2017/06/27 19:58:56]

Is this conditional necessary?

We're starting to get a fair amount of platform specific code here that isn't
likely to scale particularly well. How about moving this code into
browser_process_platform_part_chromeos? This function would become (after the
ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS ifdef)

g_browser_process->platform_part()->RegisterInProcessServices().

You could do it in a ifdef if you prefer, and if other platforms need the
functionality we can expand the ifdef. WDYT?

[mfomitchev, 2017/07/11 21:46:59]

Done. Moved a bunch of code into browser_process_platform_part_chromeos.*

+      image_cursors_ = base::MakeUnique<ui::ImageCursors>();
+    content::ServiceInfo info_ui;
+    info_ui.factory = base::Bind(&CreateEmbeddedUIService,
+                                 base::ThreadTaskRunnerHandle::Get(),
+                                 image_cursors_->GetWeakPtr());
+    info_ui.use_own_thread = true;
+    info_ui.message_loop_type = base::MessageLoop::TYPE_UI;
+    info_ui.thread_priority = base::ThreadPriority::DISPLAY;
+    services->insert(std::make_pair(ui::mojom::kServiceName, info_ui));
   }
 #endif  // OS_CHROMEOS
 }
 
 void ChromeContentBrowserClient::RegisterOutOfProcessServices(
       OutOfProcessServiceMap* services) {
 #if BUILDFLAG(ENABLE_PRINTING)
   services->emplace(printing::mojom::kServiceName,
                     base::ASCIIToUTF16("PDF Compositor Service"));
 #endif
@@ skipping 420 matching lines @@
   // displayed URL when rewriting chrome://help to chrome://settings/help.
   return url->SchemeIs(content::kChromeUIScheme) &&
          url->host() == chrome::kChromeUISettingsHost;
 }
 
 // static
 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
     const storage::QuotaSettings* settings) {
   g_default_quota_settings = settings;
 }