Replace ChildController with ShellClientFactory

mojo/shell/native_runner.h

Index: mojo/shell/native_runner.h
diff --git a/mojo/shell/native_runner.h b/mojo/shell/native_runner.h
index ff312d2559420b212671d83c817d2dcc012ff442..cbb984b7025b14987ec88ac5fffc54292cdedf2f 100644
--- a/mojo/shell/native_runner.h
+++ b/mojo/shell/native_runner.h
@@ -10,6 +10,7 @@
 #include "base/process/process_handle.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/shell/public/interfaces/shell_client.mojom.h"
+#include "mojo/shell/public/interfaces/shell_client_factory.mojom.h"
 
 namespace base {
 class FilePath;
@@ -37,9 +38,10 @@ class NativeRunner {
       const base::Closure& app_completed_callback) = 0;
 
   // Like Start(), but used to initialize the host for a child process started
-  // by someone else. Provides |request| via |channel|.
-  virtual void InitHost(ScopedHandle channel,
-                        InterfaceRequest<mojom::ShellClient> request) = 0;
+  // by someone else. Provides |request| via |factory|.
+  virtual void InitHost(mojom::ShellClientFactoryPtr factory,
+                        const String& name,
+                        mojom::ShellClientRequest request) = 0;
 };
 
 class NativeRunnerFactory {