Revert of [Android] Refactor the native test wrappers.

components/components_tests.gyp

Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 758f01ac66f60d4cc26a55df23b9295f2ad2e182..c5ca9d309f4b422ad2f048d5f2f51862893e6bc2 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -1205,6 +1205,17 @@
           'includes': [ '../build/android/jinja_template.gypi' ],
         },
         {
+          'target_name': 'components_browsertests_jni_headers',
+          'type': 'none',
+          'sources': [
+            'test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsActivity.java',
+          ],
+          'variables': {
+            'jni_gen_package': 'content/shell',
+          },
+          'includes': [ '../build/jni_generator.gypi' ],
+        },
+        {
           # TODO(GN)
           'target_name': 'components_browsertests_apk',
           'type': 'none',
@@ -1218,13 +1229,14 @@
             'components_browsertests',
           ],
           'variables': {
-            'test_suite_name': 'components_browsertests',
+            'apk_name': 'components_browsertests',
             'java_in_dir': 'test/android/browsertests_apk',
             'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/components_browsertests_manifest/AndroidManifest.xml',
             'resource_dir': 'test/android/browsertests_apk/res',
+            'native_lib_target': 'libcomponents_browsertests',
             'asset_location': '<(PRODUCT_DIR)/components_browsertests_apk_shell/assets',
           },
-          'includes': [ '../build/apk_browsertest.gypi' ],
+          'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],
@@ -1310,13 +1322,16 @@
           'conditions': [
             ['OS == "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',
               ],
               'dependencies': [
-                '../testing/android/native_test.gyp:native_test_support',
+                '../testing/android/native_test.gyp:native_test_util',
+                'components_browsertests_jni_headers',
               ],
             }],
             ['OS == "linux"', {