Replace ChildController with ShellClientFactory

mojo/shell/tests/application_manager/driver.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 <stdint.h>
 
 #include <utility>
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
@@ skipping 74 matching lines @@
         mojo::edk::CreateParentMessagePipe(primordial_pipe_token);
 
     mojo::shell::mojom::CapabilityFilterPtr filter(
         mojo::shell::mojom::CapabilityFilter::New());
     mojo::Array<mojo::String> test_interfaces;
     test_interfaces.push_back(
         mojo::shell::test::mojom::CreateInstanceForHandleTest::Name_);
     filter->filter.insert("mojo:application_manager_unittest",
                           std::move(test_interfaces));
 
+    mojo::shell::mojom::ShellClientFactoryPtr factory;
+    factory.Bind(mojo::InterfacePtrInfo<mojo::shell::mojom::ShellClientFactory>(
+        std::move(pipe), 0u));
+
     mojo::shell::mojom::ApplicationManagerPtr application_manager;
     connector->ConnectToInterface("mojo:shell", &application_manager);
-    application_manager->CreateInstanceForHandle(
-        mojo::ScopedHandle(mojo::Handle(pipe.release().value())),
-        "exe:application_manager_unittest_target", std::move(filter),
-        std::move(request));
+    application_manager->CreateInstanceForFactory(
+        std::move(factory), "exe:application_manager_unittest_target",
+        std::move(filter), std::move(request));
 
     base::LaunchOptions options;
   #if defined(OS_WIN)
     options.handles_to_inherit = &handle_passing_info;
   #elif defined(OS_POSIX)
     options.fds_to_remap = &handle_passing_info;
   #endif
     target_ = base::LaunchProcess(child_command_line, options);
     DCHECK(target_.IsValid());
     receiver->SetPID(target_.Pid());
@@ skipping 29 matching lines @@
 
 int main(int argc, char** argv) {
   base::AtExitManager at_exit;
   base::CommandLine::Init(argc, argv);
 
   mojo::shell::InitializeLogging();
 
   Driver driver;
   return mojo::shell::TestNativeMain(&driver);
 }