Remove ShellConnection::WaitForInitialize

content/child/child_thread_impl.cc

 // Copyright (c) 2012 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/child/child_thread_impl.h"
 
 #include <signal.h>
 #include <string>
 #include <utility>
 
@@ skipping 390 matching lines @@
       IPC::SyncChannel::Create(this, ChildProcess::current()->io_task_runner(),
                                ChildProcess::current()->GetShutDownEvent());
 #ifdef IPC_MESSAGE_LOG_ENABLED
   if (!IsInBrowserProcess())
     IPC::Logging::GetInstance()->SetIPCSender(this);
 #endif
 
   if (!IsInBrowserProcess()) {
     // Don't double-initialize IPC support in single-process mode.
     mojo_ipc_support_.reset(new IPC::ScopedIPCSupport(GetIOTaskRunner()));
-
     InitializeMojoIPCChannel();
   }
 
-  // If this process was launched with a primordial pipe token, we exchange it
-  // for a pipe to connect to the shell.
-  std::string pipe_token =
-      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          switches::kMojoPrimordialPipeToken);
-  if (!pipe_token.empty() && MojoShellConnectionImpl::Get()) {
-    mojo::ScopedMessagePipeHandle pipe =
-        mojo::edk::CreateChildMessagePipe(pipe_token);
-
+  if (MojoShellConnectionImpl::Get()) {
     base::ElapsedTimer timer;
-    MojoShellConnectionImpl::Get()->BindToMessagePipe(std::move(pipe));
+    MojoShellConnectionImpl::Get()->BindToRequestFromCommandLine();
     UMA_HISTOGRAM_TIMES("Mojo.Shell.ChildConnectionTime", timer.Elapsed());
   }
 
   mojo_application_.reset(new MojoApplication(GetIOTaskRunner()));
 
   sync_message_filter_ = channel_->CreateSyncMessageFilter();
   thread_safe_sender_ = new ThreadSafeSender(
       message_loop_->task_runner(), sync_message_filter_.get());
 
   resource_dispatcher_.reset(new ResourceDispatcher(
@@ skipping 314 matching lines @@
 void ChildThreadImpl::EnsureConnected() {
   VLOG(0) << "ChildThreadImpl::EnsureConnected()";
   base::Process::Current().Terminate(0, false);
 }
 
 bool ChildThreadImpl::IsInBrowserProcess() const {
   return browser_process_io_runner_;
 }
 
 }  // namespace content