[Android] Refactor browser test execution. (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 1796 matching lines @@
                 'inputs': [
                   '<(PRODUCT_DIR)/natives_blob.bin',
                   '<(PRODUCT_DIR)/snapshot_blob.bin',
                 ],
               }],
             ],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
         {
+          'target_name': 'content_shell_browsertests_java',
+          'type': 'none',
+          'dependencies': [
+            'content.gyp:content_java',
+            'content_shell_java',
+            '../base/base.gyp:base_java',
+            '../testing/android/native_test.gyp:native_test_java',
+            '../ui/android/ui_android.gyp:ui_java',
+          ],
+          'variables': {
+            'java_in_dir': 'shell/android/browsertests',
+          },
+          'includes': [ '../build/java.gypi' ],
+        },
+        {
           # TODO(GN)
           'target_name': 'content_browsertests_manifest',
           'type': 'none',
           'variables': {
             'jinja_inputs': ['shell/android/browsertests_apk/AndroidManifest.xml.jinja2'],
             'jinja_output': '<(SHARED_INTERMEDIATE_DIR)/content_browsertests_manifest/AndroidManifest.xml',
           },
           'includes': [ '../build/android/jinja_template.gypi' ],
         },
         {
           # TODO(GN)
           'target_name': 'content_browsertests_apk',
           'type': 'none',
           'dependencies': [
             'content.gyp:content_icudata',
             'content.gyp:content_java',
             'content.gyp:content_v8_external_data',
             'content_browsertests',
+            'content_shell_browsertests_java',
             'content_java_test_support',
             'content_shell_java',
           ],
           'variables': {
             'test_suite_name': 'content_browsertests',
             'isolate_file': 'content_browsertests.isolate',
             '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',
             'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
@@ skipping 343 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }