Consolidating the mojo NativeRunner functionality.

services/service_manager/background/background_service_manager.h

 // Copyright 2016 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_BACKGROUND_BACKGROUND_SERVICE_MANAGER_H_
 #define SERVICES_SERVICE_MANAGER_BACKGROUND_BACKGROUND_SERVICE_MANAGER_H_
 
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "services/catalog/store.h"
 #include "services/service_manager/public/interfaces/service.mojom.h"
+#include "services/service_manager/runner/host/service_process_launcher.h"
 
 namespace catalog {
 class Store;
 }
 
 namespace service_manager {
 
-class NativeRunnerDelegate;
 class ServiceManager;
 
 // BackgroundServiceManager starts up a Service Manager on a background thread,
 // and
 // destroys the thread in the destructor. Once created use CreateApplication()
 // to obtain an InterfaceRequest for the Application. The InterfaceRequest can
 // then be bound to an ApplicationImpl.
 class BackgroundServiceManager {
  public:
   struct InitParams {
     InitParams();
     ~InitParams();
 
-    NativeRunnerDelegate* native_runner_delegate = nullptr;
+    ServiceProcessLauncher::Delegate*
+        service_process_launcher_delegate = nullptr;
     std::unique_ptr<catalog::Store> catalog_store;
     // If true the edk is initialized.
     bool init_edk = true;
   };
 
   BackgroundServiceManager();
   ~BackgroundServiceManager();
 
   // Starts the background service manager. |command_line_switches| are
   // additional
@@ skipping 14 matching lines @@
   class MojoThread;
 
   std::unique_ptr<MojoThread> thread_;
 
   DISALLOW_COPY_AND_ASSIGN(BackgroundServiceManager);
 };
 
 }  // namespace service_manager
 
 #endif  // SERVICES_SERVICE_MANAGER_BACKGROUND_BACKGROUND_SERVICE_MANAGER_H_