[Android] Refactor browser test execution.

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 1217 matching lines @@
         },
         {
           # 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_browsertests_java',
             '../content/content_shell_and_tests.gyp:content_shell_java',
             'components_browsertests_paks_copy',
             'components_browsertests',
           ],
           'variables': {
             'test_suite_name': 'components_browsertests',
             'isolate_file': 'components_browsertests.isolate',
             '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',
@@ skipping 219 matching lines @@
           ],
           'variables': {
             'test_suite_name': 'components_unittests',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }