[Service Manager] Get rid of dynamic service discovery

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 ff08a43f16173598fba6479a99a88f69aaf4a133..ea33bd054b88c955dd1eecaae6222f6494a6ae4b 100644
--- a/content/browser/service_manager/service_manager_context.cc
+++ b/content/browser/service_manager/service_manager_context.cc
@@ -210,18 +210,18 @@ class ServiceManagerContext::InProcessServiceManagerContext
       std::unique_ptr<BuiltinManifestProvider> manifest_provider,
       service_manager::mojom::ServicePtrInfo embedder_service_proxy_info) {
     manifest_provider_ = std::move(manifest_provider);
-
-    base::SequencedWorkerPool* blocking_pool = BrowserThread::GetBlockingPool();
-    catalog_.reset(
-        new catalog::Catalog(blocking_pool, manifest_provider_.get()));
+    catalog_ =
+        base::MakeUnique<catalog::Catalog>(nullptr, manifest_provider_.get());
     service_manager_ = base::MakeUnique<service_manager::ServiceManager>(
         base::MakeUnique<NullServiceProcessLauncherFactory>(),
         catalog_->TakeService());
 
-    service_manager::mojom::ServiceRequest request =
-        service_manager_->StartEmbedderService(mojom::kBrowserServiceName);
-    mojo::FuseInterface(
-        std::move(request), std::move(embedder_service_proxy_info));
+    service_manager::mojom::ServicePtr service;
+    service.Bind(std::move(embedder_service_proxy_info));
+    service_manager_->RegisterService(
+        service_manager::Identity(
+            mojom::kBrowserServiceName, service_manager::mojom::kRootUserID),
+        std::move(service), nullptr);
   }
 
   void ShutDownOnIOThread() {