RELAND: Shape Detection: move the Mac service to the sandboxed GPU process

content/browser/service_manager/service_manager_context.cc

Index: content/browser/service_manager/service_manager_context.cc
diff --git a/content/browser/service_manager/service_manager_context.cc b/content/browser/service_manager/service_manager_context.cc
index 091bfb64f38f9e7dab170e4799f433d294978f13..57fad6e0e94a562cbff6eab7ba4306143683b6db 100644
--- a/content/browser/service_manager/service_manager_context.cc
+++ b/content/browser/service_manager/service_manager_context.cc
@@ -71,8 +71,6 @@ void StartServiceInUtilityProcess(
   service_factory->CreateService(std::move(request), service_name);
 }
 
-#if (ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
-
 // Request service_manager::mojom::ServiceFactory from GPU process host. Must be
 // called on IO thread.
 void StartServiceInGpuProcess(const std::string& service_name,
@@ -95,8 +93,6 @@ void StartServiceInGpuProcess(const std::string& service_name,
   service_factory->CreateService(std::move(request), service_name);
 }
 
-#endif  // ENABLE_MOJO_MEDIA_IN_GPU_PROCESS
-
 // A ManifestProvider which resolves application names to builtin manifest
 // resources for the catalog service to consume.
 class BuiltinManifestProvider : public catalog::ManifestProvider {
@@ -322,9 +318,6 @@ ServiceManagerContext::ServiceManagerContext() {
   GetContentClient()
       ->browser()
       ->RegisterUnsandboxedOutOfProcessServices(&unsandboxed_services);
-  unsandboxed_services.insert(
-      std::make_pair(shape_detection::mojom::kServiceName,
-                     base::ASCIIToUTF16("Shape Detection Service")));
   for (const auto& service : unsandboxed_services) {
     packaged_services_connection_->AddServiceRequestHandler(
         service.first, base::Bind(&StartServiceInUtilityProcess, service.first,
@@ -335,6 +328,12 @@ ServiceManagerContext::ServiceManagerContext() {
   packaged_services_connection_->AddServiceRequestHandler(
       "media", base::Bind(&StartServiceInGpuProcess, "media"));
 #endif
+
+  packaged_services_connection_->AddServiceRequestHandler(
+      shape_detection::mojom::kServiceName,
+      base::Bind(&StartServiceInGpuProcess,
+                 shape_detection::mojom::kServiceName));
+
   packaged_services_connection_->Start();
   ServiceManagerConnection::GetForProcess()->Start();
 }