Change primordial pipes to ShellClient

mojo/shell/runner/host/in_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/in_process_native_runner.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/platform_thread.h"
+#include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/shell/runner/host/native_application_support.h"
 #include "mojo/shell/runner/host/out_of_process_native_runner.h"
 #include "mojo/shell/runner/init.h"
 
 namespace mojo {
 namespace shell {
 
 InProcessNativeRunner::InProcessNativeRunner() : app_library_(nullptr) {}
 
 InProcessNativeRunner::~InProcessNativeRunner() {
   // It is important to let the thread exit before unloading the DSO (when
   // app_library_ is destructed), because the library may have registered
   // thread-local data and destructors to run on thread termination.
   if (thread_) {
     DCHECK(thread_->HasBeenStarted());
     DCHECK(!thread_->HasBeenJoined());
     thread_->Join();
   }
 }
 
-void InProcessNativeRunner::Start(
+mojom::ShellClientPtr InProcessNativeRunner::Start(
     const base::FilePath& app_path,
     const Identity& target,
     bool start_sandboxed,
-    mojom::ShellClientRequest request,
     const base::Callback<void(base::ProcessId)>& pid_available_callback,
     const base::Closure& app_completed_callback) {
   app_path_ = app_path;
 
   DCHECK(!request_.is_pending());
-  request_ = std::move(request);
+  mojom::ShellClientPtr client;
+  request_ = GetProxy(&client);
 
   DCHECK(app_completed_callback_runner_.is_null());
   app_completed_callback_runner_ = base::Bind(
       &base::TaskRunner::PostTask, base::ThreadTaskRunnerHandle::Get(),
       FROM_HERE, app_completed_callback);
 
   DCHECK(!thread_);
   std::string thread_name = "mojo:app_thread";
 #if defined(OS_WIN)
   thread_name = base::WideToUTF8(app_path_.BaseName().value());
 #endif
   thread_.reset(new base::DelegateSimpleThread(this, thread_name));
   thread_->Start();
   pid_available_callback.Run(base::kNullProcessId);
+
+  return client;
 }
 
 void InProcessNativeRunner::Run() {
   DVLOG(2) << "Loading/running Mojo app in process from library: "
            << app_path_.value()
            << " thread id=" << base::PlatformThread::CurrentId();
 
   // TODO(vtl): ScopedNativeLibrary doesn't have a .get() method!
   base::NativeLibrary app_library = LoadNativeApplication(app_path_);
   app_library_.Reset(app_library);
@@ skipping 12 matching lines @@
   // Non-Mojo apps are always run in a new process.
   if (!app_path.MatchesExtension(FILE_PATH_LITERAL(".mojo"))) {
     return make_scoped_ptr(
         new OutOfProcessNativeRunner(launch_process_runner_, nullptr));
   }
   return make_scoped_ptr(new InProcessNativeRunner);
 }
 
 }  // namespace shell
 }  // namespace mojo