Merge AppChildProcessHost into ChildProcessHost.

shell/out_of_process_native_runner.h

Index: shell/out_of_process_native_runner.h
diff --git a/shell/out_of_process_native_runner.h b/shell/out_of_process_native_runner.h
index 09764eaef2a1bc1b6bf451f8f950ce81a20faaf3..a2229a8123c37476cbf6c1cd1cad76d1f8bb9df1 100644
--- a/shell/out_of_process_native_runner.h
+++ b/shell/out_of_process_native_runner.h
@@ -15,8 +15,8 @@
 namespace mojo {
 namespace shell {
 
-class AppChildProcessHost;
 class Context;
+class ChildProcessHost;
 
 // An implementation of |NativeRunner| that loads/runs the given app (from the
 // file system) in a separate process (of its own).
@@ -40,7 +40,7 @@ class OutOfProcessNativeRunner : public NativeRunner {
   base::FilePath app_path_;
   base::Closure app_completed_callback_;
 
-  scoped_ptr<AppChildProcessHost> app_child_process_host_;
+  scoped_ptr<ChildProcessHost> child_process_host_;
 
   DISALLOW_COPY_AND_ASSIGN(OutOfProcessNativeRunner);
 };