Revert of [Android] Refactor the native test wrappers.

components/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 import("//tools/grit/repack.gni")
 
 # Collection of all components. You wouldn't link to this, but this is rather
@@ skipping 324 matching lines @@
   ]
 
   output = "$root_out_dir/components_tests_resources.pak"
 
   deps = [
     "//components/resources",
     "//components/strings",
   ]
 }
 
+if (is_android) {
+  import("//build/config/android/rules.gni")
+
+  generate_jni("components_browsertests_jni_headers") {
+    jni_package = "components_browsertests/shell"
+    sources = [
+      "test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsActivity.java",
+    ]
+  }
+}
+
 test("components_browsertests") {
   sources = [
     "autofill/content/browser/risk/fingerprint_browsertest.cc",
     "autofill/content/renderer/password_form_conversion_utils_browsertest.cc",
     "dom_distiller/content/distillable_page_utils_browsertest.cc",
     "dom_distiller/content/distiller_page_web_contents_browsertest.cc",
     "password_manager/content/renderer/credential_manager_client_browsertest.cc",
   ]
 
   defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
@@ skipping 21 matching lines @@
 
   data_deps = [ ":components_tests_pak" ]
 
   if (is_android) {
     sources += [
       "test/android/browsertests_apk/components_browser_tests_android.cc",
       "test/android/browsertests_apk/components_browser_tests_android.h",
       "test/android/browsertests_apk/components_browser_tests_jni_onload.cc",
     ]
     sources -= [ "autofill/content/browser/risk/fingerprint_browsertest.cc" ]
-    deps += [ "//testing/android/native_test:native_test_support" ]
+    deps += [
+      ":components_browsertests_jni_headers",
+      "//testing/android/native_test:native_test_util",
+    ]
 
     use_launcher = false
   }
 
   if (is_linux) {
     # content_extractor_browsertest is a standalone content extraction tool built as
     # a MANUAL component_browsertest.
     sources += [ "dom_distiller/standalone/content_extractor_browsertest.cc" ]
     deps += [
       "pref_registry:test_support",
@@ skipping 13 matching lines @@
 
   deps = [
     "//base",
     "//base/test:test_support_perf",
     "//testing/gtest",
     "//testing/perf",
     "//content/test:test_support",
     "//components/visitedlink/browser",
   ]
 }