Multiprocess test client: Android child process launcher rework.

mojo/edk/test/run_all_unittests.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 <signal.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/multiprocess_test.h"
 #include "base/test/test_io_thread.h"
 #include "base/test/test_suite.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"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(OS_ANDROID)
+#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);

[Ken Rockot(use gerrit already), 2016/12/12 22:23:08]

Unfortunately I'm reminded that use of non-constexpr static initializers is
explicitly forbidden by the style guide, and there's no way for this constructor
to be constexpr. Maybe someone has a more clever idea for injecting an entry
point without forcing an extra link-time requirement on all dependents. e.g. it
would be lame if we declared something like base::android::AndroidTestClientMain
and required all targets to define it.

[Jay Civelli, 2016/12/13 18:23:26]

Per our discussion, I created a main_stub and made the few targets that depend
on base:test_support but don't have a main depend on it.

+}
+#endif
+
 int main(int argc, char** argv) {
 #if !defined(OS_ANDROID)
   // Silence death test thread warnings on Linux. We can afford to run our death
   // tests a little more slowly (< 10 ms per death test on a Z620).
   // On android, we need to run in the default mode, as the threadsafe mode
   // relies on execve which is not available.
   testing::GTEST_FLAG(death_test_style) = "threadsafe";
 #endif
 #if defined(OS_ANDROID)
-  // Enable the alternate test child implementation. This is needed because Mojo
-  // tests need to spawn test children after initialising the Mojo system.
-  base::InitAndroidMultiProcessTestHelper(main);
-
   // On android, the test framework has a signal handler that will print a
   // [ CRASH ] line when the application crashes. This breaks death test has the
   // test runner will consider the death of the child process a test failure.
   // Removing the signal handler solves this issue.
   signal(SIGABRT, SIG_DFL);
 #endif
 
   base::TestSuite test_suite(argc, argv);
 
   mojo::edk::Init();
 
   mojo::test::TestSupport::Init(new mojo::edk::test::TestSupportImpl());
   base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart);
 
   mojo::edk::test::ScopedIPCSupport ipc_support(test_io_thread.task_runner());
   return base::LaunchUnitTests(
       argc, argv,
       base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
 }