Replace ChildController with ShellClientFactory

content/browser/mojo/mojo_shell_client_host.cc

 // Copyright 2015 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.
 
 #include "content/browser/mojo/mojo_shell_client_host.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/macros.h"
@@ skipping 100 matching lines @@
   //             chokepoint for all process types) and how to wire it through.
   //             http://crbug.com/555393
   std::string url = base::StringPrintf(
       "exe:chrome_renderer%d_%d", child_process_id, instance_id);
 
   mojo::shell::mojom::PIDReceiverPtr pid_receiver;
   mojo::InterfaceRequest<mojo::shell::mojom::PIDReceiver> request =
       GetProxy(&pid_receiver);
   new PIDSender(render_process_host, std::move(pid_receiver));
 
-  application_manager->CreateInstanceForHandle(
-      mojo::ScopedHandle(mojo::Handle(request_pipe.release().value())),
-      url,
-      CreateCapabilityFilterForRenderer(),
+  mojo::shell::mojom::ShellClientFactoryPtr factory;
+  factory.Bind(mojo::InterfacePtrInfo<mojo::shell::mojom::ShellClientFactory>(
+      std::move(request_pipe), 0u));
+
+  application_manager->CreateInstanceForFactory(
+      std::move(factory), url, CreateCapabilityFilterForRenderer(),
       std::move(request));
 
   // Store the URL on the RPH so client code can access it later via
   // GetMojoApplicationInstanceURL().
   SetMojoApplicationInstanceURL(render_process_host, url);
 
   return pipe_token;
 }
 
 std::string GetMojoApplicationInstanceURL(
     RenderProcessHost* render_process_host) {
   InstanceURL* instance_url = static_cast<InstanceURL*>(
       render_process_host->GetUserData(kMojoShellInstanceURL));
   return instance_url ? instance_url->get() : std::string();
 }
 
 }  // namespace content