Re-land: Re-enable multi-process IPC tests on Android.

ipc/ipc_test_base.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 "ipc/ipc_test_base.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
@@ skipping 126 matching lines @@
   client_process_ = SpawnChild(GetTestMainName());
   return DidStartClient();
 }
 
 #endif
 
 bool IPCTestBase::WaitForClientShutdown() {
   DCHECK(client_process_.IsValid());
 
   int exit_code;
+#if defined(OS_ANDROID)
+  bool rv = AndroidWaitForChildExitWithTimeout(
+      client_process_, base::TimeDelta::FromSeconds(5), &exit_code);
+#else
   bool rv = client_process_.WaitForExitWithTimeout(
       base::TimeDelta::FromSeconds(5), &exit_code);
+#endif  // defined(OS_ANDROID)
   client_process_.Close();
   return rv;
 }
 
 IPC::ChannelHandle IPCTestBase::GetTestChannelHandle() {
   return GetChannelName(test_client_name_);
 }
 
 scoped_refptr<base::SequencedTaskRunner> IPCTestBase::task_runner() {
   return message_loop_->task_runner();
 }
 
 std::unique_ptr<IPC::ChannelFactory> IPCTestBase::CreateChannelFactory(
     const IPC::ChannelHandle& handle,
     base::SequencedTaskRunner* runner) {
   return IPC::ChannelFactory::Create(handle, IPC::Channel::MODE_SERVER);
 }