Consolidating the mojo NativeRunner functionality.

services/service_manager/background/background_service_manager.h

Index: services/service_manager/background/background_service_manager.h
diff --git a/services/service_manager/background/background_service_manager.h b/services/service_manager/background/background_service_manager.h
index 16c012028f80b5a049ffc3496313d6814056fc24..044e545f98e67762c022b49fa511ec22d6a309aa 100644
--- a/services/service_manager/background/background_service_manager.h
+++ b/services/service_manager/background/background_service_manager.h
@@ -12,6 +12,7 @@
 #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;
@@ -19,7 +20,6 @@ class Store;
 
 namespace service_manager {
 
-class NativeRunnerDelegate;
 class ServiceManager;
 
 // BackgroundServiceManager starts up a Service Manager on a background thread,
@@ -33,7 +33,8 @@ class BackgroundServiceManager {
     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;