Multiprocess test client: Android child process launcher rework.

mojo/edk/test/run_all_perftests.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 "base/command_line.h"
 #include "base/test/multiprocess_test.h"
 #include "base/test/perf_test_suite.h"
 #include "base/test/test_io_thread.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/test/multiprocess_test_helper.h"
 #include "mojo/edk/test/scoped_ipc_support.h"
 #include "mojo/edk/test/test_support_impl.h"
 #include "mojo/public/tests/test_support_private.h"
 
-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::PerfTestSuite test(argc, argv);
 
   mojo::edk::Init();
   base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart);
   // Leak this because its destructor calls mojo::edk::ShutdownIPCSupport which
   // really does nothing in the new EDK but does depend on the current message
   // loop, which is destructed inside base::LaunchUnitTests.
   new mojo::edk::test::ScopedIPCSupport(test_io_thread.task_runner());
   mojo::test::TestSupport::Init(new mojo::edk::test::TestSupportImpl());
 
   return test.Run();
 }