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

content/content_tests.gypi

 # Copyright (c) 2013 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': {
     'layouttest_support_content_sources': [
       'public/test/layouttest_support.h',
       'public/test/nested_message_pump_android.cc',
       'public/test/nested_message_pump_android.h',
@@ skipping 250 matching lines @@
       'test/accessibility_browser_test_utils.cc',
       'test/accessibility_browser_test_utils.h',
       'test/browser_test_utils_browsertest.cc',
       'test/content_browser_test_test.cc',
       'test/webui_resource_browsertest.cc',
 
     ],
     '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': [
       'browser/media/webrtc_aecdump_browsertest.cc',
       'browser/media/webrtc_browsertest.cc',
       'browser/media/webrtc_getusermedia_browsertest.cc',
       'browser/media/webrtc_internals_browsertest.cc',
       'browser/media/webrtc_webcam_browsertest.cc',
       'test/webrtc_content_browsertest_base.cc',
       'test/webrtc_content_browsertest_base.h',
@@ skipping 1152 matching lines @@
               ],
             }],
             ['OS=="android"', {
               'sources': [ '<@(content_browsertests_android_sources)' ],
               'sources!': [
                 'browser/battery_status/battery_monitor_impl_browsertest.cc',
               ],
               'dependencies': [
                 'content_shell_jni_headers',
                 'content_shell_lib',
-                '../testing/android/native_test.gyp:native_test_util',
+                '../testing/android/native_test.gyp:native_test_support',
               ],
             }],
             ['OS=="mac"', {
               'dependencies': [
                 'content_shell',  # Needed for Content Shell.app's Helper.
               ],
               'sources': [
                 'renderer/external_popup_menu_browsertest.cc',
               ],
             }],
@@ skipping 341 matching lines @@
           'type': 'none',
           'dependencies': [
             'content.gyp:content_icudata',
             'content.gyp:content_java',
             'content.gyp:content_v8_external_data',
             'content_browsertests',
             'content_java_test_support',
             'content_shell_java',
           ],
           'variables': {
-            'apk_name': 'content_browsertests',
+            'test_suite_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': [
               ['icu_use_data_file_flag==1', {
                 'additional_input_paths': [
                   '<(PRODUCT_DIR)/icudtl.dat',
                 ],
               }],
               ['v8_use_external_startup_data==1', {
                 'additional_input_paths': [
                   '<(PRODUCT_DIR)/natives_blob.bin',
                   '<(PRODUCT_DIR)/snapshot_blob.bin',
                 ],
               }],
             ],
           },
-          'includes': [ '../build/java_apk.gypi' ],
+          'includes': [ '../build/apk_browsertest.gypi' ],
         },
         {
           # TODO(GN)
           'target_name': 'content_perftests_apk',
           'type': 'none',
           'dependencies': [
             'content.gyp:content_java',
             'content_perftests',
           ],
           'variables': {
@@ skipping 312 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }