Consolidating the mojo NativeRunner functionality.

services/service_manager/standalone/context.cc

 // Copyright 2013 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 "services/service_manager/standalone/context.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 20 matching lines @@
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "components/tracing/common/tracing_switches.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/catalog/catalog.h"
 #include "services/catalog/store.h"
 #include "services/service_manager/connect_params.h"
 #include "services/service_manager/connect_util.h"
 #include "services/service_manager/runner/common/switches.h"
-#include "services/service_manager/runner/host/out_of_process_native_runner.h"
+#include "services/service_manager/runner/host/service_process_launcher.h"
 #include "services/service_manager/standalone/tracer.h"
 #include "services/service_manager/switches.h"
 #include "services/tracing/public/cpp/provider.h"
 #include "services/tracing/public/cpp/switches.h"
 #include "services/tracing/public/interfaces/constants.mojom.h"
 #include "services/tracing/public/interfaces/tracing.mojom.h"
 
 #if defined(OS_MACOSX)
 #include "services/service_manager/public/cpp/standalone_service/mach_broker.h"
 #endif
@@ skipping 14 matching lines @@
 class Setup {
  public:
   Setup() { mojo::edk::Init(); }
 
   ~Setup() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Setup);
 };
 
+class ServiceProcessLauncherFactoryImpl : public ServiceProcessLauncherFactory {
+ public:
+  ServiceProcessLauncherFactoryImpl(base::TaskRunner* launch_process_runner,
+                                    ServiceProcessLauncher::Delegate* delegate)
+      : launch_process_runner_(launch_process_runner),
+        delegate_(delegate) {
+  }
+
+ private:
+   std::unique_ptr<ServiceProcessLauncher> Create(
+      const base::FilePath& service_path) override {
+    return base::MakeUnique<ServiceProcessLauncher>(
+        launch_process_runner_, delegate_, service_path);
+  }
+
+  base::TaskRunner* launch_process_runner_;
+  ServiceProcessLauncher::Delegate* delegate_;
+};
+
 std::unique_ptr<base::Thread> CreateIOThread(const char* name) {
   std::unique_ptr<base::Thread> thread(new base::Thread(name));
   base::Thread::Options options;
   options.message_loop_type = base::MessageLoop::TYPE_IO;
   thread->StartWithOptions(options);
   return thread;
 }
 
 void OnInstanceQuit(const std::string& name, const Identity& identity) {
   if (name == identity.name())
@@ skipping 43 matching lines @@
       kThreadPoolMaxThreads, "blocking_pool", base::TaskPriority::USER_VISIBLE);
 
   init_edk_ = !init_params || init_params->init_edk;
   if (init_edk_) {
     mojo::edk::InitIPCSupport(this, io_thread_->task_runner().get());
 #if defined(OS_MACOSX)
     mojo::edk::SetMachPortProvider(MachBroker::GetInstance()->port_provider());
 #endif
   }
 
-  std::unique_ptr<NativeRunnerFactory> runner_factory =
-      base::MakeUnique<OutOfProcessNativeRunnerFactory>(
+  std::unique_ptr<ServiceProcessLauncherFactory>
+      service_process_launcher_factory =
+      base::MakeUnique<ServiceProcessLauncherFactoryImpl>(
           blocking_pool_.get(),
-          init_params ? init_params->native_runner_delegate : nullptr);
+          init_params ? init_params->service_process_launcher_delegate
+                      : nullptr);
   std::unique_ptr<catalog::Store> store;
   if (init_params)
     store = std::move(init_params->catalog_store);
   catalog_.reset(
       new catalog::Catalog(blocking_pool_.get(), std::move(store), nullptr));
-  service_manager_.reset(new ServiceManager(std::move(runner_factory),
-                                            catalog_->TakeService()));
+  service_manager_.reset(
+      new ServiceManager(std::move(service_process_launcher_factory),
+                         catalog_->TakeService()));
 
   if (command_line.HasSwitch(::switches::kServiceOverrides)) {
     base::FilePath overrides_file(GetPathFromCommandLineSwitch(
         command_line.GetSwitchValueASCII(::switches::kServiceOverrides)));
     JSONFileValueDeserializer deserializer(overrides_file);
     int error = 0;
     std::string message;
     std::unique_ptr<base::Value> contents =
         deserializer.Deserialize(&error, &message);
     if (!contents) {
@@ skipping 84 matching lines @@
   mojom::InterfaceProviderPtr local_interfaces;
 
   std::unique_ptr<ConnectParams> params(new ConnectParams);
   params->set_source(CreateServiceManagerIdentity());
   params->set_target(Identity(name, mojom::kRootUserID));
   params->set_remote_interfaces(mojo::GetProxy(&remote_interfaces));
   service_manager_->Connect(std::move(params));
 }
 
 }  // namespace service_manager