Change primordial pipes to ShellClient

mojo/shell/runner/child/test_native_main.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 "mojo/shell/runner/child/test_native_main.h"
 
 #include <utility>
 
 #include "base/debug/stack_trace.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/launch.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/process_delegate.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"
 #include "mojo/shell/runner/init.h"
 
 namespace mojo {
 namespace shell {
 namespace {
 
 class ProcessDelegate : public mojo::edk::ProcessDelegate {
  public:
   ProcessDelegate() {}
   ~ProcessDelegate() override {}
@@ skipping 21 matching lines @@
 
     ProcessDelegate process_delegate;
     base::Thread io_thread("io_thread");
     base::Thread::Options io_thread_options(base::MessageLoop::TYPE_IO, 0);
     CHECK(io_thread.StartWithOptions(io_thread_options));
 
     mojo::edk::InitIPCSupport(&process_delegate, io_thread.task_runner());
     mojo::edk::SetParentPipeHandleFromCommandLine();
 
     base::MessageLoop loop;
-    mojo::ShellConnection impl(shell_client);;
-    scoped_ptr<mojo::shell::RunnerConnection> connection =
-        mojo::shell::RunnerConnection::Create(&impl);
+    mojo::ShellConnection impl(
+        shell_client, mojo::shell::GetShellClientRequestFromCommandLine());
     loop.Run();
 
     mojo::edk::ShutdownIPCSupport();
   }
 
   return 0;
 }
 
 }  // namespace shell
 }  // namespace mojo