Consolidating the mojo NativeRunner functionality.

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 14 matching lines @@
 #include "content/public/common/content_client.h"
 #include "content/public/common/service_manager_connection.h"
 #include "content/public/common/service_names.mojom.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "services/catalog/catalog.h"
 #include "services/catalog/manifest_provider.h"
 #include "services/catalog/public/interfaces/constants.mojom.h"
 #include "services/catalog/store.h"
 #include "services/file/public/interfaces/constants.mojom.h"
 #include "services/service_manager/connect_params.h"
-#include "services/service_manager/native_runner.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/interfaces/service.mojom.h"
 #include "services/service_manager/runner/common/client_util.h"
 #include "services/service_manager/service_manager.h"
 
 namespace content {
 
 namespace {
 
@@ skipping 80 matching lines @@
   std::unique_ptr<base::Value> GetManifest(const std::string& name) override {
     auto it = manifests_.find(name);
     return it != manifests_.end() ? it->second->CreateDeepCopy() : nullptr;
   }
 
   std::map<std::string, std::unique_ptr<base::Value>> manifests_;
 
   DISALLOW_COPY_AND_ASSIGN(BuiltinManifestProvider);
 };
 
-class NullNativeRunnerFactory : public service_manager::NativeRunnerFactory {
+class NullServiceProcessLauncherFactory
+    : public service_manager::ServiceProcessLauncherFactory {
  public:
-  NullNativeRunnerFactory() {}
-  ~NullNativeRunnerFactory() override {}
+  NullServiceProcessLauncherFactory() {}
+  ~NullServiceProcessLauncherFactory() override {}
 
-  std::unique_ptr<service_manager::NativeRunner> Create(
+ private:
+  std::unique_ptr<service_manager::ServiceProcessLauncher> Create(
       const base::FilePath& service_path) override {
     LOG(ERROR) << "Attempting to run unsupported native service: "
                << service_path.value();
     return nullptr;
   }
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(NullNativeRunnerFactory);
+  DISALLOW_COPY_AND_ASSIGN(NullServiceProcessLauncherFactory);
 };
 
 }  // namespace
 
 // State which lives on the IO thread and drives the ServiceManager.
 class ServiceManagerContext::InProcessServiceManagerContext
     : public base::RefCountedThreadSafe<InProcessServiceManagerContext> {
  public:
   InProcessServiceManagerContext() {}
 
@@ skipping 22 matching lines @@
   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);
 
     base::SequencedWorkerPool* blocking_pool = BrowserThread::GetBlockingPool();
-    catalog_.reset(
-        new catalog::Catalog(blocking_pool, nullptr, manifest_provider_.get()));
-    service_manager_.reset(new service_manager::ServiceManager(
-        base::MakeUnique<NullNativeRunnerFactory>(), catalog_->TakeService()));
+    catalog_ = base::MakeUnique<catalog::Catalog>(
+        blocking_pool, 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));
   }
 
   void ShutDownOnIOThread() {
     service_manager_.reset();
     catalog_.reset();
@@ skipping 118 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