Multiprocess test client: Android child process launcher rework.

ipc/run_all_unittests.cc

Index: ipc/run_all_unittests.cc
diff --git a/ipc/run_all_unittests.cc b/ipc/run_all_unittests.cc
index a9d213352e01d69f75d86b8cddfdd839cc7093f7..c9b94dc572387420e3aa4b17246988c557f8ab0a 100644
--- a/ipc/run_all_unittests.cc
+++ b/ipc/run_all_unittests.cc
@@ -15,10 +15,17 @@
 #include "base/mac/mach_port_broker.h"
 #endif
 
-int main(int argc, char** argv) {
 #if defined(OS_ANDROID)
-  base::InitAndroidMultiProcessTestHelper(main);
+#include "base/test/android/android_main_function_thunk.h"
+
+int main(int argc, char** argv);
+namespace {
+// Needed for multiprocess tests to find the main function.
+base::android::AndroidMainFunctionThunk main_thunk(&main);
+}
 #endif
+
+int main(int argc, char** argv) {
   base::TestSuite test_suite(argc, argv);
   mojo::edk::Init();
   base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart);