| Index: content/content_tests.gypi
 | 
| diff --git a/content/content_tests.gypi b/content/content_tests.gypi
 | 
| index 0a000db647e979570a01ca202e6853e0a314afa0..b7598defdfae0ff6b9067d0cde813f46ae0036a7 100644
 | 
| --- a/content/content_tests.gypi
 | 
| +++ b/content/content_tests.gypi
 | 
| @@ -1765,6 +1765,7 @@
 | 
|            ],
 | 
|            'variables': {
 | 
|              'test_suite_name': 'content_unittests',
 | 
| +            'isolate_file': 'content_unittests.isolate',
 | 
|              'conditions': [
 | 
|                ['v8_use_external_startup_data==1', {
 | 
|                  'asset_location': '<(PRODUCT_DIR)/content_unittests_apk/assets',
 | 
| @@ -1805,6 +1806,7 @@
 | 
|            ],
 | 
|            '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',
 | 
| @@ -1986,8 +1988,13 @@
 | 
|              'resource_dir': 'shell/android/shell_apk/res',
 | 
|              'additional_src_dirs': ['public/android/javatests/', ],
 | 
|              'is_test_apk': 1,
 | 
| +            'test_type': 'instrumentation',
 | 
| +            'isolate_file': 'content_shell_test_apk.isolate',
 | 
|            },
 | 
| -          'includes': [ '../build/java_apk.gypi' ],
 | 
| +          'includes': [
 | 
| +            '../build/java_apk.gypi',
 | 
| +            '../build/android/test_runner.gypi',
 | 
| +          ],
 | 
|          },
 | 
|          {
 | 
|            # GN: //content/public/android:content_junit_tests
 | 
| 
 |