Merge AppChildProcessHost into ChildProcessHost.

shell/BUILD.gn

 # 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.
 
 import("//build/config/ui.gni")
 import("//mojo/public/mojo.gni")
 import("//mojo/public/mojo_application.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//mojo/tools/embed/rules.gni")
 import("//testing/test.gni")
@@ skipping 115 matching lines @@
 
   deps = [
     "//base",
   ]
 }
 
 source_set("lib") {
   sources = [
     "app_child_process.cc",
     "app_child_process.h",
-    "app_child_process_host.cc",
-    "app_child_process_host.h",
     "child_process.cc",
     "child_process.h",
     "child_process_host.cc",
     "child_process_host.h",
     "command_line_util.cc",
     "command_line_util.h",
     "context.cc",
     "context.h",
     "external_application_listener.cc",
     "external_application_listener.h",
@@ skipping 274 matching lines @@
   ]
 
   if (is_win) {
     deps -= [ "//shell/domain_socket" ]
   }
 }
 
 # GYP version: mojo/mojo.gyp:mojo_shell_tests
 test("mojo_shell_tests") {
   sources = [
-    "app_child_process_host_unittest.cc",
+    "child_process_host_unittest.cc",
     "command_line_util_unittest.cc",
     "data_pipe_peek_unittest.cc",
     "in_process_native_runner_unittest.cc",
     "native_runner_unittest.cc",
     "shell_test_base.cc",
     "shell_test_base.h",
     "shell_test_base_android.cc",
     "shell_test_base_unittest.cc",
     "shell_test_main.cc",
     "url_resolver_unittest.cc",
@@ skipping 121 matching lines @@
     "//mojo/public/cpp/system:system",
     "//mojo/services/http_server/public/cpp",
     "//mojo/services/http_server/public/interfaces",
     "//mojo/services/network/public/interfaces",
     "//shell/test:bindings",
     ":embed_pingable",
   ]
 
   data_deps = [ "//services/http_server:http_server($default_toolchain)" ]
 }