Multiprocess test client: Android child process launcher rework.

testing/android/native_test/native_test_launcher.cc

Index: testing/android/native_test/native_test_launcher.cc
diff --git a/testing/android/native_test/native_test_launcher.cc b/testing/android/native_test/native_test_launcher.cc
index 2389c731a681c50c71f145803bbdf7d30c9d7f9f..70fac6350e2042e9f0e77fb8c666dde53592dff7 100644
--- a/testing/android/native_test/native_test_launcher.cc
+++ b/testing/android/native_test/native_test_launcher.cc
@@ -24,6 +24,7 @@
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
+#include "base/test/android/test_support_jni_registrar.h"
 #include "base/test/test_support_android.h"
 #include "gtest/gtest.h"
 #include "jni/NativeTest_jni.h"
@@ -124,13 +125,14 @@ static void RunTests(JNIEnv* env,
   base::InitAndroidTestPaths(test_data_dir);
 
   ScopedMainEntryLogger scoped_main_entry_logger;
-  main(argc, &argv[0]);
+  main(argc, &(argv[0]));

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

nit: unnecessary

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

Done.

 }
 
 bool RegisterNativeTestJNI(JNIEnv* env) {
-  if (!base::android::RegisterJni(env)) {
+  if (!base::android::RegisterJni(env))
+    return false;
+  if (!base::android::RegisterTestSupportJni(env))
     return false;
-  }
   return RegisterNativesImpl(env);
 }