Revert of [Service Manager] Get rid of dynamic service discovery

content/browser/service_manager/service_manager_context.cc

 // Copyright 2015 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 "content/browser/service_manager/service_manager_context.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 192 matching lines @@
 
  private:
   friend class base::RefCountedThreadSafe<InProcessServiceManagerContext>;
 
   ~InProcessServiceManagerContext() {}
 
   void StartOnIOThread(
       std::unique_ptr<BuiltinManifestProvider> manifest_provider,
       service_manager::mojom::ServicePtrInfo embedder_service_proxy_info) {
     manifest_provider_ = std::move(manifest_provider);
-    catalog_ =
-        base::MakeUnique<catalog::Catalog>(nullptr, manifest_provider_.get());
+
+    base::SequencedWorkerPool* blocking_pool = BrowserThread::GetBlockingPool();
+    catalog_.reset(
+        new catalog::Catalog(blocking_pool, manifest_provider_.get()));
     service_manager_ = base::MakeUnique<service_manager::ServiceManager>(
         base::MakeUnique<NullServiceProcessLauncherFactory>(),
         catalog_->TakeService());
 
-    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);
+    service_manager::mojom::ServiceRequest request =
+        service_manager_->StartEmbedderService(mojom::kBrowserServiceName);
+    mojo::FuseInterface(
+        std::move(request), std::move(embedder_service_proxy_info));
   }
 
   void ShutDownOnIOThread() {
     service_manager_.reset();
     catalog_.reset();
     manifest_provider_.reset();
   }
 
   std::unique_ptr<BuiltinManifestProvider> manifest_provider_;
   std::unique_ptr<catalog::Catalog> catalog_;
@@ skipping 111 matching lines @@
                           base::Bind(&DestroyConnectorOnIOThread));
 }
 
 // static
 service_manager::Connector* ServiceManagerContext::GetConnectorForIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return g_io_thread_connector.Get().get();
 }
 
 }  // namespace content