Implement a new child test helper for Android.

mojo/edk/test/multiprocess_test_helper.cc

 // Copyright 2013 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/edk/test/multiprocess_test_helper.h"
 
 #include <functional>
 #include <set>
 #include <utility>
 
@@ skipping 114 matching lines @@
   ChildProcessLaunched(test_child_.Handle(), channel.PassServerHandle());
   CHECK(test_child_.IsValid());
 
   return pipe;
 }
 
 int MultiprocessTestHelper::WaitForChildShutdown() {
   CHECK(test_child_.IsValid());
 
   int rv = -1;
+#if defined(OS_ANDROID)
+  // On Android, we need to use a special function to wait for the child.
+  CHECK(AndroidWaitForChildExitWithTimeout(
+      test_child_, TestTimeouts::action_timeout(), &rv));
+#else
   CHECK(
       test_child_.WaitForExitWithTimeout(TestTimeouts::action_timeout(), &rv));
+#endif
   test_child_.Close();
   return rv;
 }
 
 bool MultiprocessTestHelper::WaitForChildTestShutdown() {
   return WaitForChildShutdown() == 0;
 }
 
 // static
 void MultiprocessTestHelper::ChildSetup() {
@@ skipping 29 matching lines @@
             ::testing::Test::HasNonfatalFailure()) ? 1 : 0;
   });
 }
 
 // static
 std::string MultiprocessTestHelper::primordial_pipe_token;
 
 }  // namespace test
 }  // namespace edk
 }  // namespace mojo