Rename AppChildController -> ChildController.

shell/child_process_host.h

Index: shell/child_process_host.h
diff --git a/shell/child_process_host.h b/shell/child_process_host.h
index a6a0fb802e4f01ded8729b1f1082475d08bec51e..ab299825b4651361130806b74070008cd28e044b 100644
--- a/shell/child_process_host.h
+++ b/shell/child_process_host.h
@@ -13,7 +13,7 @@
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/public/cpp/bindings/error_handler.h"
-#include "shell/app_child_process.mojom.h"
+#include "shell/child_controller.mojom.h"
 
 namespace mojo {
 namespace shell {
@@ -45,17 +45,17 @@ class ChildProcessHost : public ErrorHandler {
   // callback has been called.
   int Join();
 
-  // Methods relayed to the |AppChildController|. These methods may be only be
+  // Methods relayed to the |ChildController|. These methods may be only be
   // called after |Start()|, but may be called immediately (without waiting for
   // |DidStart()|).
 
-  // Like |AppChildController::StartApp()|, but with one difference:
+  // Like |ChildController::StartApp()|, but with one difference:
   // |on_app_complete| will *always* get called, even on connection error (or
   // even if the child process failed to start at all).
   void StartApp(const String& app_path,
                 bool clean_app_path,
                 InterfaceRequest<Application> application_request,
-                const AppChildController::StartAppCallback& on_app_complete);
+                const ChildController::StartAppCallback& on_app_complete);
   void ExitNow(int32_t exit_code);
 
   // TODO(vtl): This is virtual, so tests can override it, but really |Start()|
@@ -76,9 +76,9 @@ class ChildProcessHost : public ErrorHandler {
   Context* const context_;
   embedder::PlatformChannelPair platform_channel_pair_;
 
-  AppChildControllerPtr controller_;
+  ChildControllerPtr controller_;
   embedder::ChannelInfo* channel_info_;
-  AppChildController::StartAppCallback on_app_complete_;
+  ChildController::StartAppCallback on_app_complete_;
 
   base::Process child_process_;