Replace ChildController with ShellClientFactory

mojo/shell/runner/host/out_of_process_native_runner.h

Index: mojo/shell/runner/host/out_of_process_native_runner.h
diff --git a/mojo/shell/runner/host/out_of_process_native_runner.h b/mojo/shell/runner/host/out_of_process_native_runner.h
index 6b63c8ad6e059b95a0b0d2d3b8c1279c21fd4ece..8d4ce1046ea7ed04e901560ab1e4874e76192dbd 100644
--- a/mojo/shell/runner/host/out_of_process_native_runner.h
+++ b/mojo/shell/runner/host/out_of_process_native_runner.h
@@ -12,6 +12,7 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "mojo/shell/native_runner.h"
+#include "mojo/shell/public/interfaces/shell_client_factory.mojom.h"
 
 namespace base {
 class TaskRunner;
@@ -36,20 +37,20 @@ class OutOfProcessNativeRunner : public NativeRunner {
       const base::FilePath& app_path,
       const Identity& identity,
       bool start_sandboxed,
-      InterfaceRequest<mojom::ShellClient> request,
+      mojom::ShellClientRequest request,
       const base::Callback<void(base::ProcessId)>& pid_available_callback,
       const base::Closure& app_completed_callback) override;
-  void InitHost(
-      ScopedHandle channel,
-      InterfaceRequest<mojom::ShellClient> request) override;
+  void InitHost(mojom::ShellClientFactoryPtr factory,
+                const String& name,
+                mojom::ShellClientRequest request) override;
 
  private:
-  // |ChildController::StartApp()| callback:
-  void AppCompleted(int32_t result);
+  void AppCompleted();
 
   // Callback run when the child process has launched.
   void OnProcessLaunched(
-      InterfaceRequest<mojom::ShellClient> request,
+      mojom::ShellClientRequest request,
+      const String& name,
       const base::Callback<void(base::ProcessId)>& pid_available_callback,
       base::ProcessId pid);