[mojo] Ports EDK

mojo/shell/runner/host/out_of_process_native_runner.cc

 // Copyright 2014 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 "mojo/shell/runner/host/out_of_process_native_runner.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 23 matching lines @@
     InterfaceRequest<Application> application_request,
     const base::Callback<void(base::ProcessId)>& pid_available_callback,
     const base::Closure& app_completed_callback) {
   app_path_ = app_path;
 
   DCHECK(app_completed_callback_.is_null());
   app_completed_callback_ = app_completed_callback;
 
   child_process_host_.reset(
       new ChildProcessHost(launch_process_runner_, start_sandboxed, app_path));
-  child_process_host_->Start(pid_available_callback);
-
-  child_process_host_->StartApp(
-      std::move(application_request),
-      base::Bind(&OutOfProcessNativeRunner::AppCompleted,
-                 base::Unretained(this)));
+  child_process_host_->Start(base::Bind(
+      &OutOfProcessNativeRunner::OnProcessLaunched, base::Unretained(this),
+      base::Passed(&application_request), pid_available_callback));
 }
 
 void OutOfProcessNativeRunner::InitHost(
     ScopedHandle channel,
     InterfaceRequest<Application> application_request) {
   child_process_host_.reset(new ChildProcessHost(std::move(channel)));
   child_process_host_->StartApp(
       std::move(application_request),
       base::Bind(&OutOfProcessNativeRunner::AppCompleted,
                  base::Unretained(this)));
 }
 
 void OutOfProcessNativeRunner::AppCompleted(int32_t result) {
   DVLOG(2) << "OutOfProcessNativeRunner::AppCompleted(" << result << ")";
 
   if (child_process_host_)
     child_process_host_->Join();
   child_process_host_.reset();
   // This object may be deleted by this callback.
   base::Closure app_completed_callback = app_completed_callback_;
   app_completed_callback_.Reset();
   app_completed_callback.Run();
 }
 
-scoped_ptr<NativeRunner> OutOfProcessNativeRunnerFactory::Create(
+void OutOfProcessNativeRunner::OnProcessLaunched(
+    InterfaceRequest<Application> application_request,
+    const base::Callback<void(base::ProcessId)>& pid_available_callback,
+    base::ProcessId pid) {
+  DCHECK(child_process_host_);
+  child_process_host_->StartApp(
+      std::move(application_request),
+      base::Bind(&OutOfProcessNativeRunner::AppCompleted,
+                 base::Unretained(this)));
+  pid_available_callback.Run(pid);
+}
+
+scoped_ptr<shell::NativeRunner> OutOfProcessNativeRunnerFactory::Create(
     const base::FilePath& app_path) {
   return make_scoped_ptr(new OutOfProcessNativeRunner(launch_process_runner_));
 }
 
 }  // namespace shell
 }  // namespace mojo