Revert of [Android] Refactor the native test wrappers.

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index d122a35896bee75c76215643230831945486582b..9aa9cdf89b4f467588fb86b827a6902c85ea7c45 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -268,6 +268,8 @@
     'content_browsertests_android_sources': [
       'browser/accessibility/android_granularity_movement_browsertest.cc',
       'browser/accessibility/android_hit_testing_browsertest.cc',
+      'shell/android/browsertests_apk/content_browser_tests_android.cc',
+      'shell/android/browsertests_apk/content_browser_tests_android.h',
       'shell/android/browsertests_apk/content_browser_tests_jni_onload.cc',
     ],
     'content_browsertests_webrtc_sources': [
@@ -1439,7 +1441,7 @@
               'dependencies': [
                 'content_shell_jni_headers',
                 'content_shell_lib',
-                '../testing/android/native_test.gyp:native_test_support',
+                '../testing/android/native_test.gyp:native_test_util',
               ],
             }],
             ['OS=="mac"', {
@@ -1801,10 +1803,11 @@
             'content_shell_java',
           ],
           'variables': {
-            'test_suite_name': 'content_browsertests',
+            'apk_name': 'content_browsertests',
             'java_in_dir': 'shell/android/browsertests_apk',
             'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/content_browsertests_manifest/AndroidManifest.xml',
             'resource_dir': 'shell/android/browsertests_apk/res',
+            'native_lib_target': 'libcontent_browsertests',
             'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
             'asset_location': '<(PRODUCT_DIR)/content_shell/assets',
             'conditions': [
@@ -1821,7 +1824,7 @@
               }],
             ],
           },
-          'includes': [ '../build/apk_browsertest.gypi' ],
+          'includes': [ '../build/java_apk.gypi' ],
         },
         {
           # TODO(GN)