[Android] Refactor the native test wrappers. (RELAND)

This is a reland of https://codereview.chromium.org/1126543009/, which
broke gtests built by GN.

BUG=476410

Review URL: https://codereview.chromium.org/1143903002

Cr-Commit-Position: refs/heads/master@{#331056}

5 files changed, 21 insertions, 145 deletions

diff --git a/components/test/android/browsertests_apk/AndroidManifest.xml.jinja2 b/components/test/android/browsertests_apk/AndroidManifest.xml.jinja2
index 3ac010d..97dae9e 100644
--- a/components/test/android/browsertests_apk/AndroidManifest.xml.jinja2
+++ b/components/test/android/browsertests_apk/AndroidManifest.xml.jinja2
@@ -47,6 +47,10 @@
         {% endfor %}
     </application>
 
+    <instrumentation android:name="org.chromium.native_test.NativeTestInstrumentationTestRunner"
+            android:label="ComponentsBrowserTests"
+            android:targetPackage="org.chromium.components_browsertests_apk"/>
+
     <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
diff --git a/components/test/android/browsertests_apk/components_browser_tests_android.cc b/components/test/android/browsertests_apk/components_browser_tests_android.cc
deleted file mode 100644
index baf8efe..0000000
--- a/components/test/android/browsertests_apk/components_browser_tests_android.cc
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2015 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.
-
-// This class sets up the environment for running the content browser tests
-// inside an android application.
-
-#include <android/log.h>
-#include <unistd.h>
-
-#include "base/android/base_jni_registrar.h"
-#include "base/android/fifo_utils.h"
-#include "base/android/jni_android.h"
-#include "base/android/jni_string.h"
-#include "base/android/library_loader/library_loader_hooks.h"
-#include "base/android/scoped_java_ref.h"
-#include "base/base_switches.h"
-#include "base/command_line.h"
-#include "base/files/file_path.h"
-#include "base/logging.h"
-#include "base/strings/string_tokenizer.h"
-#include "base/strings/string_util.h"
-#include "base/strings/stringprintf.h"
-#include "content/public/common/content_switches.h"
-#include "content/public/test/test_launcher.h"
-#include "jni/ComponentsBrowserTestsActivity_jni.h"
-#include "media/base/media_switches.h"
-#include "testing/android/native_test/native_test_util.h"
-
-using testing::native_test_util::ArgsToArgv;
-using testing::native_test_util::ParseArgsFromCommandLineFile;
-using testing::native_test_util::ScopedMainEntryLogger;
-
-// The main function of the program to be wrapped as an apk.
-extern int main(int argc, char** argv);
-
-namespace {
-
-// The test runner script writes the command line file in
-// "/data/local/tmp".
-static const char kCommandLineFilePath[] =
-    "/data/local/tmp/components-browser-tests-command-line";
-
-}  // namespace
-
-namespace components {
-
-// TODO(jaekyun): Refactor and deduplicate with
-// testing/android/native_test/native_test_launcher.cc (http://crbug.com/476410)
-static void RunTests(JNIEnv* env,
-                     jobject obj,
-                     jstring jfiles_dir,
-                     jobject app_context) {
-  // Command line basic initialization, will be fully initialized later.
-  static const char* const kInitialArgv[] = {"ComponentsBrowserTestsActivity"};
-  base::CommandLine::Init(arraysize(kInitialArgv), kInitialArgv);
-
-  // Set the application context in base.
-  base::android::ScopedJavaLocalRef<jobject> scoped_context(
-      env, env->NewLocalRef(app_context));
-  base::android::InitApplicationContext(env, scoped_context);
-  base::android::RegisterJni(env);
-
-  std::vector<std::string> args;
-  ParseArgsFromCommandLineFile(kCommandLineFilePath, &args);
-
-  std::vector<char*> argv;
-  int argc = ArgsToArgv(args, &argv);
-
-  // Fully initialize command line with arguments.
-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  command_line->AppendArguments(base::CommandLine(argc, &argv[0]), false);
-
-  // Append required switches.
-  command_line->AppendSwitch(content::kSingleProcessTestsFlag);
-  command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
-  command_line->AppendSwitch(switches::kUseFakeUIForMediaStream);
-  // Specify a socket name to not conflict with the default one used
-  // in content_shell.
-  command_line->AppendSwitchASCII(switches::kRemoteDebuggingSocketName,
-                                  "components_browsertests_devtools_remote");
-
-  // Create fifo and redirect stdout and stderr to it.
-  base::FilePath files_dir(
-      base::android::ConvertJavaStringToUTF8(env, jfiles_dir));
-  base::FilePath fifo_path(files_dir.Append(base::FilePath("test.fifo")));
-  base::android::CreateFIFO(fifo_path, 0666);
-  base::android::RedirectStream(stdout, fifo_path, "w+");
-  dup2(STDOUT_FILENO, STDERR_FILENO);
-
-  ScopedMainEntryLogger scoped_main_entry_logger;
-  main(argc, &argv[0]);
-}
-
-bool RegisterComponentsBrowserTestsAndroid(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
-}  // namespace components
diff --git a/components/test/android/browsertests_apk/components_browser_tests_android.h b/components/test/android/browsertests_apk/components_browser_tests_android.h
deleted file mode 100644
index a989706..0000000
--- a/components/test/android/browsertests_apk/components_browser_tests_android.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015 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.
-
-#ifndef COMPONENTS_TEST_ANDROID_BROWSERTESTS_APK_COMPONENTS_BROWSER_TESTS_ANDROID_H_
-#define COMPONENTS_TEST_ANDROID_BROWSERTESTS_APK_COMPONENTS_BROWSER_TESTS_ANDROID_H_
-
-#include <jni.h>
-
-namespace components {
-
-bool RegisterComponentsBrowserTestsAndroid(JNIEnv* env);
-
-}  // namespace components
-
-#endif  // COMPONENTS_TEST_ANDROID_BROWSERTESTS_APK_COMPONENTS_BROWSER_TESTS_ANDROID_H_
diff --git a/components/test/android/browsertests_apk/components_browser_tests_jni_onload.cc b/components/test/android/browsertests_apk/components_browser_tests_jni_onload.cc
index e47b840..6b15e3c 100644
--- a/components/test/android/browsertests_apk/components_browser_tests_jni_onload.cc
+++ b/components/test/android/browsertests_apk/components_browser_tests_jni_onload.cc
@@ -2,21 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/android/base_jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/bind.h"
-#include "components/test/android/browsertests_apk/components_browser_tests_android.h"
 #include "content/public/app/content_jni_onload.h"
 #include "content/public/app/content_main.h"
 #include "content/public/test/nested_message_pump_android.h"
 #include "content/shell/android/shell_jni_registrar.h"
 #include "content/shell/app/shell_main_delegate.h"
+#include "testing/android/native_test/native_test_launcher.h"
 
 namespace {
 
 bool RegisterJNI(JNIEnv* env) {
-  return content::android::RegisterShellJni(env) &&
-         content::NestedMessagePumpAndroid::RegisterJni(env) &&
-         components::RegisterComponentsBrowserTestsAndroid(env);
+  return base::android::RegisterJni(env) &&
+      content::android::RegisterShellJni(env) &&
+      content::NestedMessagePumpAndroid::RegisterJni(env) &&
+      testing::android::RegisterNativeTestJNI(env);
 }
 
 bool Init() {
diff --git a/components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsActivity.java b/components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsActivity.java
index bbf2461..ae94edc 100644
--- a/components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsActivity.java
+++ b/components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsActivity.java
@@ -4,43 +4,44 @@
 
 package org.chromium.components_browsertests_apk;
 
-import android.app.Activity;
-import android.content.Context;
 import android.os.Bundle;
-import android.os.Handler;
-import android.util.Log;
 import android.view.Window;
 import android.view.WindowManager;
 
-import org.chromium.base.JNINamespace;
+import org.chromium.base.Log;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.content.browser.BrowserStartupController;
 import org.chromium.content_shell.ShellManager;
+import org.chromium.native_test.NativeBrowserTestActivity;
 import org.chromium.ui.base.ActivityWindowAndroid;
 import org.chromium.ui.base.WindowAndroid;
 
 /**
  * Android activity for running components browser tests
  */
-@JNINamespace("components")
-public class ComponentsBrowserTestsActivity extends Activity {
-    private static final String TAG = "ComponentsBrowserTestsActivity";
+public class ComponentsBrowserTestsActivity extends NativeBrowserTestActivity {
+    private static final String TAG = Log.makeTag("native_test");
 
     private ShellManager mShellManager;
     private WindowAndroid mWindowAndroid;
 
     @Override
-    @SuppressFBWarnings("DM_EXIT")
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        appendCommandLineFlags(
+                "--remote-debugging-socket-name components_browsertests_devtools_remote");
+    }
 
+    @Override
+    @SuppressFBWarnings("DM_EXIT")
+    protected void initializeBrowserProcess() {
         try {
             LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER).ensureInitialized();
         } catch (ProcessInitException e) {
-            Log.i(TAG, "Cannot load components_browsertests:" + e);
+            Log.e(TAG, "Cannot load components_browsertests.", e);
             System.exit(-1);
         }
         BrowserStartupController.get(getApplicationContext(), LibraryProcessType.PROCESS_BROWSER)
@@ -55,21 +56,5 @@ public class ComponentsBrowserTestsActivity extends Activity {
         wind.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
         wind.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
         wind.addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
-
-        new Handler().post(new Runnable() {
-            @Override
-            public void run() {
-                Log.i(TAG, "Running tests");
-                runTests();
-                Log.i(TAG, "Tests finished.");
-                finish();
-            }
-        });
-    }
-
-    private void runTests() {
-        nativeRunTests(getFilesDir().getAbsolutePath(), getApplicationContext());
     }
-
-    private native void nativeRunTests(String filesDir, Context appContext);
 }