1 files changed, 35 insertions, 5 deletions
diff --git a/src/core/content_utility_client_qt.cpp b/src/core/content_utility_client_qt.cpp
index f49fa6386..0b2dbd08e 100644
--- a/src/core/content_utility_client_qt.cpp
+++ b/src/core/content_utility_client_qt.cpp
@@ -39,6 +39,7 @@
 
 #include "content_utility_client_qt.h"
 
+#include "base/bind.h"
 #include "content/public/utility/utility_thread.h"
 #include "services/proxy_resolver/proxy_resolver_service.h"
 
@@ -50,12 +51,41 @@ ContentUtilityClientQt::ContentUtilityClientQt()
 
 ContentUtilityClientQt::~ContentUtilityClientQt() = default;
 
-void ContentUtilityClientQt::RegisterServices(ContentUtilityClient::StaticServiceMap *services)
+namespace {
+
+std::unique_ptr<service_manager::Service> CreateProxyResolverService(service_manager::mojom::ServiceRequest request)
 {
-    service_manager::EmbeddedServiceInfo proxy_resolver_info;
-    proxy_resolver_info.task_runner = content::ChildThread::Get()->GetIOTaskRunner();
-    proxy_resolver_info.factory = base::BindRepeating(&proxy_resolver::ProxyResolverService::CreateService);
-    services->emplace(proxy_resolver::mojom::kProxyResolverServiceName, proxy_resolver_info);
+    return std::make_unique<proxy_resolver::ProxyResolverService>(std::move(request));
+}
+
+using ServiceFactory = base::OnceCallback<std::unique_ptr<service_manager::Service>()>;
+void RunServiceOnIOThread(ServiceFactory factory)
+{
+    base::OnceClosure terminate_process = base::BindOnce(
+                base::IgnoreResult(&base::SequencedTaskRunner::PostTask),
+                base::SequencedTaskRunnerHandle::Get(), FROM_HERE,
+                base::BindOnce([] { content::UtilityThread::Get()->ReleaseProcess(); }));
+    content::ChildThread::Get()->GetIOTaskRunner()->PostTask(
+                FROM_HERE,
+                base::BindOnce(
+                    [](ServiceFactory factory, base::OnceClosure terminate_process) {
+                        service_manager::Service::RunAsyncUntilTermination(
+                                std::move(factory).Run(), std::move(terminate_process));
+                    },
+                    std::move(factory), std::move(terminate_process)));
+}
+
+}  // namespace
+
+bool ContentUtilityClientQt::HandleServiceRequest(const std::string &service_name,
+                                                  service_manager::mojom::ServiceRequest request)
+{
+    if (service_name == proxy_resolver::mojom::kProxyResolverServiceName) {
+        RunServiceOnIOThread(base::BindOnce(&CreateProxyResolverService, std::move(request)));
+        return true;
+    }
+
+    return false;
 }
 
 } // namespace