Consolidating the mojo NativeRunner functionality.

services/service_manager/service_manager.h

 // Copyright 2014 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.
 
 #ifndef SERVICES_SERVICE_MANAGER_SERVICE_MANAGER_H_
 #define SERVICES_SERVICE_MANAGER_SERVICE_MANAGER_H_
 
 #include <map>
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/interface_ptr_set.h"
 #include "services/service_manager/connect_params.h"
-#include "services/service_manager/native_runner.h"
 #include "services/service_manager/public/cpp/identity.h"
 #include "services/service_manager/public/cpp/interface_factory.h"
 #include "services/service_manager/public/cpp/interface_provider_spec.h"
 #include "services/service_manager/public/interfaces/connector.mojom.h"
 #include "services/service_manager/public/interfaces/interface_provider.mojom.h"
 #include "services/service_manager/public/interfaces/resolver.mojom.h"
 #include "services/service_manager/public/interfaces/service.mojom.h"
 #include "services/service_manager/public/interfaces/service_factory.mojom.h"
 #include "services/service_manager/public/interfaces/service_manager.mojom.h"
+#include "services/service_manager/runner/host/service_process_launcher.h"
 #include "services/service_manager/service_overrides.h"
 
 namespace service_manager {
 
 class ServiceContext;
 
 // Creates an identity for the Service Manager, used when the Service Manager
 // connects to services.
 Identity CreateServiceManagerIdentity();
 
 class ServiceManager {
  public:
   // API for testing.
   class TestAPI {
    public:
     explicit TestAPI(ServiceManager* service_manager);
     ~TestAPI();
 
     // Returns true if there is a Instance for this name.
     bool HasRunningInstanceForName(const std::string& name) const;
    private:
     ServiceManager* service_manager_;
 
     DISALLOW_COPY_AND_ASSIGN(TestAPI);
   };
 
-  // |native_runner_factory| is an instance of an object capable of vending
-  // implementations of NativeRunner, e.g. for in or out-of-process execution.
-  // See native_runner.h and RunNativeApplication().
-  // |file_task_runner| provides access to a thread to perform file copy
-  // operations on.
-  ServiceManager(std::unique_ptr<NativeRunnerFactory> native_runner_factory,
+  // |service_process_launcher_factory| is an instance of an object capable of
+  // vending implementations of ServiceProcessLauncher, e.g. for out-of-process
+  // execution.
+  ServiceManager(std::unique_ptr<ServiceProcessLauncherFactory>
+                     service_process_launcher_factory,
                  mojom::ServicePtr catalog);
   ~ServiceManager();
 
   // Sets overrides for service executable and package resolution. Must be
   // called before any services are launched.
   void SetServiceOverrides(std::unique_ptr<ServiceOverrides> overrides);
 
   // Provide a callback to be notified whenever an instance is destroyed.
   // Typically the creator of the Service Manager will use this to determine
   // when some set of services it created are destroyed, so it can shut down.
@@ skipping 106 matching lines @@
   Instance* service_manager_instance_;
 
   // Tracks the names of instances that are allowed to field connection requests
   // from all users.
   std::set<std::string> singletons_;
 
   std::map<Identity, mojom::ServiceFactoryPtr> service_factories_;
   std::map<Identity, mojom::ResolverPtr> identity_to_resolver_;
   mojo::InterfacePtrSet<mojom::ServiceManagerListener> listeners_;
   base::Callback<void(const Identity&)> instance_quit_callback_;
-  std::unique_ptr<NativeRunnerFactory> native_runner_factory_;
+  std::unique_ptr<ServiceProcessLauncherFactory>
+      service_process_launcher_factory_;
   std::unique_ptr<ServiceContext> service_context_;
   base::WeakPtrFactory<ServiceManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceManager);
 };
 
 mojom::Connector::ConnectCallback EmptyConnectCallback();
 
 }  // namespace service_manager
 
 #endif  // SERVICES_SERVICE_MANAGER_SERVICE_MANAGER_H_