Revert of 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 52cb1b9f077675dbcad313769c9f7d105f61b5a1..c400726c1c84c109691fb8abe0e8234fb2138f97 100644
--- a/content/browser/service_manager/service_manager_context.cc
+++ b/content/browser/service_manager/service_manager_context.cc
@@ -71,6 +71,8 @@
   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,
@@ -92,6 +94,8 @@
       mojo::MakeRequest(&service_factory));
   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.
@@ -317,6 +321,9 @@
   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,
@@ -327,12 +334,6 @@
   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();
 }