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

components/components_tests.gyp

 # 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.
 
 {
   'variables': {
     # This turns on e.g. the filename-based detection of which
     # platforms to include source files on (e.g. files ending in
     # _mac.h or _mac.cc are only compiled on MacOSX).
     'chromium_code': 1,
@@ skipping 1191 matching lines @@
         {
           'target_name': 'components_browsertests_manifest',
           'type': 'none',
           'variables': {
             'jinja_inputs': ['test/android/browsertests_apk/AndroidManifest.xml.jinja2'],
             'jinja_output': '<(SHARED_INTERMEDIATE_DIR)/components_browsertests_manifest/AndroidManifest.xml',
           },
           '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',
           'dependencies': [
             '../content/content.gyp:content_icudata',
             '../content/content.gyp:content_java',
             '../content/content.gyp:content_v8_external_data',
             '../content/content_shell_and_tests.gyp:content_java_test_support',
             '../content/content_shell_and_tests.gyp:content_shell_java',
             'components_browsertests_paks_copy',
             'components_browsertests',
           ],
           'variables': {
-            'apk_name': 'components_browsertests',
+            'test_suite_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/java_apk.gypi' ],
+          'includes': [ '../build/apk_browsertest.gypi' ],
         },
       ],
     }],
     ['OS != "ios"', {
       'targets': [
         {
           # GN: //components:components_perftests
           'target_name': 'components_perftests',
           'type': '<(gtest_target_type)',
           'dependencies': [
@@ skipping 65 matching lines @@
             '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',
             'dom_distiller/content/test/dom_distiller_js_browsertest.cc',
             'password_manager/content/renderer/credential_manager_client_browsertest.cc',
           ],
           '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_util',
-                'components_browsertests_jni_headers',
+                '../testing/android/native_test.gyp:native_test_support',
               ],
             }],
             ['OS == "linux"', {
               'sources': [
                   # content_extractor_browsertest is a standalone content extraction tool built as
                   # a MANUAL component_browsertest.
                   'dom_distiller/standalone/content_extractor_browsertest.cc',
                 ],
             }],
             ['OS=="win"', {
@@ skipping 113 matching lines @@
           ],
           'variables': {
             'test_suite_name': 'components_unittests',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }