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 398 matching lines @@
     // 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);

[Ben Goodger (Google), 2016/03/13 00:58:33]

since you're passing this on the command line too can you consolidate this with
the flag the shell uses for the processes it launches & then just get rid of the
parameter to Connect()?

[Ken Rockot(use gerrit already), 2016/03/13 16:14:25]

Done

   if (!pipe_token.empty() && MojoShellConnectionImpl::Get()) {
     mojo::ScopedMessagePipeHandle pipe =
         mojo::edk::CreateChildMessagePipe(pipe_token);
 
     base::ElapsedTimer timer;
-    MojoShellConnectionImpl::Get()->BindToMessagePipe(std::move(pipe));
+    MojoShellConnectionImpl::Get()->Connect(
+        mojo::MakeRequest<mojo::shell::mojom::ShellClientFactory>(
+            std::move(pipe)));
     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