Revert of Build services as standalone executables

services/service_manager/runner/host/out_of_process_native_runner.h

Index: services/service_manager/runner/host/out_of_process_native_runner.h
diff --git a/services/service_manager/runner/host/out_of_process_native_runner.h b/services/service_manager/runner/host/out_of_process_native_runner.h
index e2e8e4f4d73f616592bc781237ed241a4787c39a..df61565b7ef18823e0d2b1c71541d485dcd34d98 100644
--- a/services/service_manager/runner/host/out_of_process_native_runner.h
+++ b/services/service_manager/runner/host/out_of_process_native_runner.h
@@ -24,17 +24,17 @@
 class ChildProcessHost;
 class NativeRunnerDelegate;
 
-// An implementation of |NativeRunner| that runs a given service executable
-// in a separate, dedicated process.
+// An implementation of |NativeRunner| that loads/runs the given app (from the
+// file system) in a separate process (of its own).
 class OutOfProcessNativeRunner : public NativeRunner {
  public:
-  OutOfProcessNativeRunner(const base::FilePath& service_path,
-                           base::TaskRunner* launch_process_runner,
+  OutOfProcessNativeRunner(base::TaskRunner* launch_process_runner,
                            NativeRunnerDelegate* delegate);
   ~OutOfProcessNativeRunner() override;
 
   // NativeRunner:
   mojom::ServicePtr Start(
+      const base::FilePath& app_path,
       const Identity& identity,
       bool start_sandboxed,
       const base::Callback<void(base::ProcessId)>& pid_available_callback,
@@ -46,7 +46,7 @@
   base::TaskRunner* const launch_process_runner_;
   NativeRunnerDelegate* delegate_;
 
-  const base::FilePath service_path_;
+  base::FilePath app_path_;
   base::Closure app_completed_callback_;
 
   std::unique_ptr<ChildProcessHost> child_process_host_;
@@ -60,8 +60,7 @@
                                   NativeRunnerDelegate* delegate);
   ~OutOfProcessNativeRunnerFactory() override;
 
-  std::unique_ptr<NativeRunner> Create(
-      const base::FilePath& service_path) override;
+  std::unique_ptr<NativeRunner> Create(const base::FilePath& app_path) override;
 
  private:
   base::TaskRunner* const launch_process_runner_;