Merge AppChildProcessHost into ChildProcessHost.

shell/app_child_process_host.cc

Index: shell/app_child_process_host.cc
diff --git a/shell/app_child_process_host.cc b/shell/app_child_process_host.cc
deleted file mode 100644
index 6cdcfaa206602704ce6861f6a473316823eb7104..0000000000000000000000000000000000000000
--- a/shell/app_child_process_host.cc
+++ /dev/null
@@ -1,89 +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.
-
-#include "shell/app_child_process_host.h"
-
-#include "base/bind.h"
-#include "base/logging.h"
-#include "base/message_loop/message_loop.h"
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/public/cpp/system/core.h"
-#include "shell/context.h"
-#include "shell/task_runners.h"
-
-namespace mojo {
-namespace shell {
-
-AppChildProcessHost::AppChildProcessHost(Context* context)
-    : ChildProcessHost(context), channel_info_(nullptr) {
-}
-
-AppChildProcessHost::~AppChildProcessHost() {
-}
-
-void AppChildProcessHost::StartApp(
-    const String& app_path,
-    bool clean_app_path,
-    InterfaceRequest<Application> application_request,
-    const AppChildController::StartAppCallback& on_app_complete) {
-  DCHECK(controller_);
-
-  on_app_complete_ = on_app_complete;
-  controller_->StartApp(
-      app_path, clean_app_path, application_request.Pass(),
-      base::Bind(&AppChildProcessHost::AppCompleted, base::Unretained(this)));
-}
-
-void AppChildProcessHost::ExitNow(int32_t exit_code) {
-  DCHECK(controller_);
-
-  controller_->ExitNow(exit_code);
-}
-
-void AppChildProcessHost::WillStart() {
-  DCHECK(platform_channel()->is_valid());
-
-  ScopedMessagePipeHandle handle(embedder::CreateChannel(
-      platform_channel()->Pass(), context()->task_runners()->io_runner(),
-      base::Bind(&AppChildProcessHost::DidCreateChannel,
-                 base::Unretained(this)),
-      base::MessageLoop::current()->message_loop_proxy()));
-
-  controller_.Bind(handle.Pass());
-  controller_.set_error_handler(this);
-}
-
-void AppChildProcessHost::DidStart(bool success) {
-  DVLOG(2) << "AppChildProcessHost::DidStart()";
-
-  if (!success) {
-    LOG(ERROR) << "Failed to start app child process";
-    AppCompleted(MOJO_RESULT_UNKNOWN);
-    return;
-  }
-}
-
-void AppChildProcessHost::OnConnectionError() {
-  AppCompleted(MOJO_RESULT_UNKNOWN);
-}
-
-// Callback for |embedder::CreateChannel()|.
-void AppChildProcessHost::DidCreateChannel(
-    embedder::ChannelInfo* channel_info) {
-  DVLOG(2) << "AppChildProcessHost::DidCreateChannel()";
-
-  CHECK(channel_info);
-  channel_info_ = channel_info;
-}
-
-void AppChildProcessHost::AppCompleted(int32_t result) {
-  if (!on_app_complete_.is_null()) {
-    auto on_app_complete = on_app_complete_;
-    on_app_complete_.reset();
-    on_app_complete.Run(result);
-  }
-}
-
-}  // namespace shell
-}  // namespace mojo