Consolidating the mojo NativeRunner functionality.

services/service_manager/runner/host/child_process_host.h

Index: services/service_manager/runner/host/child_process_host.h
diff --git a/services/service_manager/runner/host/child_process_host.h b/services/service_manager/runner/host/child_process_host.h
deleted file mode 100644
index ab87d02ae29048e8c89489bfe762c80f6c8bc269..0000000000000000000000000000000000000000
--- a/services/service_manager/runner/host/child_process_host.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// 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_RUNNER_HOST_CHILD_PROCESS_HOST_H_
-#define SERVICES_SERVICE_MANAGER_RUNNER_HOST_CHILD_PROCESS_HOST_H_
-
-#include <stdint.h>
-
-#include <memory>
-#include <string>
-
-#include "base/callback.h"
-#include "base/command_line.h"
-#include "base/files/file_path.h"
-#include "base/macros.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/weak_ptr.h"
-#include "base/process/process.h"
-#include "base/synchronization/lock.h"
-#include "base/synchronization/waitable_event.h"
-#include "mojo/edk/embedder/platform_channel_pair.h"
-#include "mojo/public/cpp/system/message_pipe.h"
-#include "services/service_manager/public/cpp/identity.h"
-#include "services/service_manager/public/interfaces/service_factory.mojom.h"
-#include "services/service_manager/runner/host/child_process_host.h"
-
-namespace base {
-class TaskRunner;
-}
-
-namespace service_manager {
-
-class Identity;
-class NativeRunnerDelegate;
-
-// This class represents a "child process host". Handles launching and
-// connecting a platform-specific "pipe" to the child, and supports joining the
-// child process. Currently runs a single service, loaded from a standalone
-// service executable on the file system.
-//
-// This class is not thread-safe. It should be created/used/destroyed on a
-// single thread.
-//
-// Note: Does not currently work on Windows before Vista.
-class ChildProcessHost {
- public:
-  using ProcessReadyCallback = base::Callback<void(base::ProcessId)>;
-
-  // |name| is just for debugging ease. We will spawn off a process so that it
-  // can be sandboxed if |start_sandboxed| is true. |service_path| is a path to
-  // the service executable we wish to start.
-  ChildProcessHost(base::TaskRunner* launch_process_runner,
-                   NativeRunnerDelegate* delegate,
-                   bool start_sandboxed,
-                   const Identity& target,
-                   const base::FilePath& service_path);
-  virtual ~ChildProcessHost();
-
-  // |Start()|s the child process; calls |DidStart()| (on the thread on which
-  // |Start()| was called) when the child has been started (or failed to start).
-  mojom::ServicePtr Start(const Identity& target,
-                              const ProcessReadyCallback& callback,
-                              const base::Closure& quit_closure);
-
-  // Waits for the child process to terminate.
-  void Join();
-
- protected:
-  void DidStart(const ProcessReadyCallback& callback);
-
- private:
-  void DoLaunch(std::unique_ptr<base::CommandLine> child_command_line);
-
-  scoped_refptr<base::TaskRunner> launch_process_runner_;
-  NativeRunnerDelegate* delegate_ = nullptr;
-  bool start_sandboxed_ = false;
-  Identity target_;
-  base::FilePath service_path_;
-  base::Process child_process_;
-
-  // Used to initialize the Mojo IPC channel between parent and child.
-  std::unique_ptr<mojo::edk::PlatformChannelPair> mojo_ipc_channel_;
-  mojo::edk::HandlePassingInformation handle_passing_info_;
-  const std::string child_token_;
-
-  // Since Start() calls a method on another thread, we use an event to block
-  // the main thread if it tries to destruct |this| while launching the process.
-  base::WaitableEvent start_child_process_event_;
-
-  base::WeakPtrFactory<ChildProcessHost> weak_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(ChildProcessHost);
-};
-
-}  // namespace service_manager
-
-#endif  // SERVICES_SERVICE_MANAGER_RUNNER_HOST_CHILD_PROCESS_HOST_H_