Change primordial pipes to ShellClient

content/common/mojo/mojo_shell_connection_impl.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/common/mojo/mojo_shell_connection_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_local.h"
 #include "mojo/converters/network/network_type_converters.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/shell/public/cpp/shell_client.h"
 #include "mojo/shell/public/cpp/shell_connection.h"
-#include "mojo/shell/runner/child/runner_connection.h"
+#include "mojo/shell/runner/common/client_util.h"
 
 namespace content {
 namespace {
 
 using MojoShellConnectionPtr =
     base::ThreadLocalPointer<MojoShellConnectionImpl>;
 
 // Env is thread local so that aura may be used on multiple threads.
 base::LazyInstance<MojoShellConnectionPtr>::Leaky lazy_tls_ptr =
     LAZY_INSTANCE_INITIALIZER;
@@ skipping 24 matching lines @@
       new mojo::ShellConnection(connection, std::move(request)));
 }
 
 // static
 MojoShellConnectionImpl* MojoShellConnectionImpl::Get() {
   return static_cast<MojoShellConnectionImpl*>(MojoShellConnection::Get());
 }
 
 void MojoShellConnectionImpl::BindToRequestFromCommandLine() {
   DCHECK(!shell_connection_);
-
-  shell_connection_.reset(new mojo::ShellConnection(this));
-  runner_connection_ =
-      mojo::shell::RunnerConnection::Create(shell_connection_.get(),
-                                            false /* exit_on_error */);
-  if (!runner_connection_) {
-    delete this;
-    lazy_tls_ptr.Pointer()->Set(nullptr);
-  }
+  shell_connection_.reset(new mojo::ShellConnection(
+      this, mojo::shell::GetShellClientRequestFromCommandLine()));
 }
 
 MojoShellConnectionImpl::MojoShellConnectionImpl(bool external) :
     external_(external) {}
 
 MojoShellConnectionImpl::~MojoShellConnectionImpl() {
   STLDeleteElements(&listeners_);
 }
 
 void MojoShellConnectionImpl::Initialize(mojo::Connector* connector,
@@ skipping 37 matching lines @@
 // static
 void MojoShellConnection::Destroy() {
   // This joins the shell controller thread.
   delete Get();
   lazy_tls_ptr.Pointer()->Set(nullptr);
 }
 
 MojoShellConnection::~MojoShellConnection() {}
 
 }  // namespace content