Rename all isolate_dependency_* to files.

Merges the lists when relevant. This simplify the management significantly.

Remove the .isolate from the '*_run' target 'includes' section.

TBR=vadimsh@chromium.org
BUG=swarming:148

Review URL: https://codereview.chromium.org/614923005

Cr-Commit-Position: refs/heads/master@{#297633}

18 files changed, 113 insertions, 181 deletions

diff --git a/chrome/angle.isolate b/chrome/angle.isolate
index 4b2d70d..151cd1b 100644
--- a/chrome/angle.isolate
+++ b/chrome/angle.isolate
@@ -8,7 +8,7 @@
   'conditions': [
     ['OS=="win"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/d3dcompiler_46.dll',
           '<(PRODUCT_DIR)/libEGL.dll',
           '<(PRODUCT_DIR)/libGLESv2.dll',
diff --git a/chrome/angle_unittests.isolate b/chrome/angle_unittests.isolate
index 1689ebc..1cb7b23 100644
--- a/chrome/angle_unittests.isolate
+++ b/chrome/angle_unittests.isolate
@@ -11,7 +11,7 @@
         'command': [
           '<(PRODUCT_DIR)/angle_unittests<(EXECUTABLE_SUFFIX)',
         ],
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/angle_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
index cbb092c..ad88dfd 100644
--- a/chrome/browser_tests.isolate
+++ b/chrome/browser_tests.isolate
@@ -12,7 +12,7 @@
           '--test-launcher-bot-mode',
           '--lsan=<(lsan)',
         ],
-        'isolate_dependency_tracked': [
+        'files': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)/libclearkeycdm.so',
           '<(PRODUCT_DIR)/libclearkeycdmadapter.so',
@@ -22,55 +22,53 @@
     }],
     ['OS=="linux" and use_ozone==0', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
     ['OS=="linux" and libpeer_target_type=="loadable_module"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/lib/libpeerconnection.so',
         ],
       },
     }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
-        'isolate_dependency_tracked': [
-          '../media/test/data/',
-          '../ppapi/tests/test_case.html',
-          '../ppapi/tests/test_page.css',
-          '../testing/test_env.py',
-          '../third_party/accessibility-audit/axs_testing.js',
-          '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
-          '<(PRODUCT_DIR)/peerconnection_server<(EXECUTABLE_SUFFIX)',
-          '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc.nmf',
-          '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib.nmf',
-          '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl.nmf',
-          '<(PRODUCT_DIR)/test_case.html',
-          '<(PRODUCT_DIR)/test_case.html.mock-http-headers',
-          '<(PRODUCT_DIR)/test_page.css',
-          'browser/policy/test/asn1der.py',
-          'browser/policy/test/policy_testserver.py',
-        ],
-        'isolate_dependency_untracked': [
+        'files': [
           '../content/test/data/',
           '../google_apis/test/',
           '../media/test/data/',
+          '../media/test/data/',
           '../net/data/',
           '../net/tools/testserver/',
+          '../ppapi/tests/test_case.html',
+          '../ppapi/tests/test_page.css',
+          '../testing/test_env.py',
+          '../third_party/accessibility-audit/axs_testing.js',
           '../third_party/pyftpdlib/',
           '../third_party/pywebsocket/',
           '../third_party/safe_browsing/',
           '../third_party/simplejson/',
           '../third_party/tlslite/',
+          '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/nacl_test_data/',
+          '<(PRODUCT_DIR)/peerconnection_server<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/pnacl/',
+          '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc.nmf',
+          '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib.nmf',
+          '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl.nmf',
           '<(PRODUCT_DIR)/pseudo_locales/',
           '<(PRODUCT_DIR)/pyproto/',
           '<(PRODUCT_DIR)/remoting/unittests/',
+          '<(PRODUCT_DIR)/test_case.html',
+          '<(PRODUCT_DIR)/test_case.html.mock-http-headers',
           '<(PRODUCT_DIR)/test_data/',
+          '<(PRODUCT_DIR)/test_page.css',
           '<(PRODUCT_DIR)/test_url_loader_data/',
+          'browser/policy/test/asn1der.py',
+          'browser/policy/test/policy_testserver.py',
           'common/extensions/docs/examples/apps/calculator/',
           'test/data/',
           'third_party/mock4js/',
@@ -80,17 +78,15 @@
     }],
     ['OS=="linux" or OS=="win"', {
       'variables': {
-        'isolate_dependency_tracked': [
-          '<(PRODUCT_DIR)/mock_nacl_gdb<(EXECUTABLE_SUFFIX)',
-        ],
-        'isolate_dependency_untracked': [
+        'files': [
           '../third_party/bidichecker/',
+          '<(PRODUCT_DIR)/mock_nacl_gdb<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
     ['OS=="win" or (OS=="linux" and target_arch=="x64")', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/lib64/',
           '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc_x64.nexe',
           '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_x64.nexe',
@@ -100,22 +96,20 @@
     }],
     ['OS=="mac"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/clearkeycdmadapter.plugin',
           '<(PRODUCT_DIR)/content_shell.pak',
           '<(PRODUCT_DIR)/libclearkeycdm.dylib',
           '<(PRODUCT_DIR)/osmesa.so',
-          '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests',
-        ],
-        'isolate_dependency_untracked': [
           '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/',
           '<(PRODUCT_DIR)/plugins/test_netscape_plugin.plugin/',
+          '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests',
         ],
       },
     }],
     ['OS=="mac" and target_arch=="ia32"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/lib32/',
           '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc_x32.nexe',
           '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_x32.nexe',
@@ -134,50 +128,46 @@
     }],
     ['OS=="win"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '../native_client/build/build_nexe.py',
           '<(PRODUCT_DIR)/chrome_elf.dll',
           '<(PRODUCT_DIR)/clearkeycdm.dll',
           '<(PRODUCT_DIR)/clearkeycdmadapter.dll',
+          '<(PRODUCT_DIR)/plugins/',
           '<(PRODUCT_DIR)/ppapi_tests.dll',
           'tools/build/repack_locales.py',
         ],
-        'isolate_dependency_untracked': [
-          '<(PRODUCT_DIR)/plugins/',
-        ],
       },
     }],
     ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
       'variables': {
-        'isolate_dependency_untracked': [
+        'files': [
           '<(PRODUCT_DIR)/browser_tests.exe.pdb',
         ],
       },
     }],
     ['OS=="win" and libpeer_target_type=="loadable_module"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/libpeerconnection.dll',
         ],
       },
     }],
     ['chromeos==1', {
       'variables': {
-        'isolate_dependency_tracked': [
-          '<(PRODUCT_DIR)/content_shell.pak',
-          '<(PRODUCT_DIR)/keyboard_resources.pak',
-          '<(PRODUCT_DIR)/libexif.so',
-          '<(PRODUCT_DIR)/nacl_helper',
-          '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
-          'browser/chromeos/login/test/https_forwarder.py',
-        ],
-        'isolate_dependency_untracked': [
+        'files': [
           '../chromeos/test/data/',
           '../ui/file_manager/file_manager/',
           '../ui/webui/resources/js/',
           '<(PRODUCT_DIR)/chromevox_test_data/',
+          '<(PRODUCT_DIR)/content_shell.pak',
+          '<(PRODUCT_DIR)/keyboard_resources.pak',
+          '<(PRODUCT_DIR)/libexif.so',
           '<(PRODUCT_DIR)/locales/',
+          '<(PRODUCT_DIR)/nacl_helper',
+          '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
           '<(PRODUCT_DIR)/resources/chromeos/',
+          'browser/chromeos/login/test/https_forwarder.py',
         ],
       },
     }],
diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate
index 339329e..d13da6d 100644
--- a/chrome/chrome.isolate
+++ b/chrome/chrome.isolate
@@ -5,7 +5,7 @@
   'conditions': [
     ['OS=="linux"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/libosmesa.so',
           '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)',
@@ -15,7 +15,7 @@
     }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/resources.pak',
         ],
       },
@@ -25,27 +25,25 @@
         'command': [
           '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)',
         ],
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/chrome_100_percent.pak',
           '<(PRODUCT_DIR)/locales/en-US.pak',
           '<(PRODUCT_DIR)/locales/fr.pak',
-        ],
-        'isolate_dependency_untracked': [
           '<(PRODUCT_DIR)/resources/extension/',
         ],
       },
     }],
     ['OS=="win" or (OS=="linux" and target_arch=="x64")', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
         ],
       },
     }],
     ['OS=="win"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/chrome_200_percent.pak',
         ],
       },
@@ -55,20 +53,18 @@
         'command': [
           '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/MacOS/<(mac_product_name)',
         ],
-        'isolate_dependency_tracked': [
-          '<(PRODUCT_DIR)/exif.so',
-          '<(PRODUCT_DIR)/ffmpegsumo.so',
-        ],
-        'isolate_dependency_untracked': [
+        'files': [
           '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
           '<(PRODUCT_DIR)/<(mac_product_name) Helper.app/',
           '<(PRODUCT_DIR)/<(mac_product_name).app/',
+          '<(PRODUCT_DIR)/exif.so',
+          '<(PRODUCT_DIR)/ffmpegsumo.so',
         ],
       },
     }],
     ['OS=="win"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/<(version_full).manifest',
           '<(PRODUCT_DIR)/chrome.dll',
           '<(PRODUCT_DIR)/chrome_elf.dll',
@@ -80,14 +76,14 @@
     }],
     ['OS=="win" and target_arch=="ia32"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/nacl64.exe',
         ],
       },
     }],
     ['OS=="win" and component=="static_library"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/chrome_child.dll',
         ],
       },
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 93386d4..12b2ee4 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -676,7 +676,6 @@
           ],
           'includes': [
             '../build/isolate.gypi',
-            'chrome.isolate',
           ],
           'sources': [
             'chrome.isolate',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index f2cddaf..8787887 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2930,7 +2930,6 @@
           ],
           'includes': [
             '../build/isolate.gypi',
-            'browser_tests.isolate',
           ],
           'sources': [
             'browser_tests.isolate',
@@ -2958,7 +2957,6 @@
           ],
           'includes': [
             '../build/isolate.gypi',
-            'interactive_ui_tests.isolate',
           ],
           'sources': [
             'interactive_ui_tests.isolate',
@@ -2979,7 +2977,6 @@
           ],
           'includes': [
             '../build/isolate.gypi',
-            'sync_integration_tests.isolate',
           ],
           'sources': [
             'sync_integration_tests.isolate',
@@ -3009,9 +3006,6 @@
                 '../gpu/gpu.gyp:angle_unittests',
                 'gpu_tests_base',
               ],
-              'includes': [
-                'angle_unittests.isolate',
-              ],
               'sources': [
                 'angle_unittests.isolate',
               ],
@@ -3023,9 +3017,6 @@
                 '../gpu/gpu.gyp:gl_tests',
                 'gpu_tests_base',
               ],
-              'includes': [
-                'gl_tests.isolate',
-              ],
               'sources': [
                 'gl_tests.isolate',
               ],
@@ -3037,9 +3028,6 @@
                 'browser_tests_run',
                 'gpu_tests_base',
               ],
-              'includes': [
-                'tab_capture_end2end_tests.isolate',
-              ],
               'sources': [
                 'tab_capture_end2end_tests.isolate',
               ],
@@ -3052,9 +3040,6 @@
                 '../tools/telemetry/telemetry.gyp:bitmaptools#host',
                 'gpu_tests_base',
               ],
-              'includes': [
-                'telemetry_gpu_test.isolate',
-              ],
               'sources': [
                 'telemetry_gpu_test.isolate',
               ],
@@ -3066,9 +3051,6 @@
                 '../gpu/gpu.gyp:gpu_unittests',
                 'gpu_tests_base',
               ],
-              'includes': [
-                'gpu_unittests.isolate',
-              ],
               'sources': [
                 'gpu_unittests.isolate',
               ],
@@ -3084,9 +3066,6 @@
                     '../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_test',
                     'gpu_tests_base',
                   ],
-                  'includes': [
-                    'gles2_conform_test.isolate',
-                  ],
                   'sources': [
                     'gles2_conform_test.isolate',
                   ],
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 4e9c994..7567b3c 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2861,7 +2861,6 @@
           ],
           'includes': [
             '../build/isolate.gypi',
-            'unit_tests.isolate',
           ],
           'sources': [
             'unit_tests.isolate',
diff --git a/chrome/gl_tests.isolate b/chrome/gl_tests.isolate
index 1afc399..112eb72 100644
--- a/chrome/gl_tests.isolate
+++ b/chrome/gl_tests.isolate
@@ -11,7 +11,7 @@
         'command': [
           '<(PRODUCT_DIR)/gl_tests<(EXECUTABLE_SUFFIX)',
         ],
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/gl_tests<(EXECUTABLE_SUFFIX)',
         ],
       },
diff --git a/chrome/gles2_conform_test.isolate b/chrome/gles2_conform_test.isolate
index 91d86a3..d096770 100644
--- a/chrome/gles2_conform_test.isolate
+++ b/chrome/gles2_conform_test.isolate
@@ -12,7 +12,7 @@
         'command': [
           '<(PRODUCT_DIR)/gles2_conform_test<(EXECUTABLE_SUFFIX)',
         ],
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/gles2_conform_test<(EXECUTABLE_SUFFIX)',
           '../gpu/gles2_conform_support/gles2_conform_test_expectations.txt',
         ],
@@ -21,14 +21,12 @@
     # .isolate format doesn't support nested conditions.
     ['(OS=="linux" or OS=="mac" or OS=="win") and internal_gles2_conform_tests==1', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
+          '../third_party/gles2_conform/GTF_ES/',
           '<(PRODUCT_DIR)/gles2_conform_test_windowless<(EXECUTABLE_SUFFIX)',
           # Could add gles2_conform_test_angle or
           # gles2_conform_test_chromeos if the bots were testing those.
         ],
-        'isolate_dependency_untracked': [
-          '../third_party/gles2_conform/GTF_ES/',
-        ],
       },
     }],
   ],
diff --git a/chrome/gpu_unittests.isolate b/chrome/gpu_unittests.isolate
index 3bdd334..6219888 100644
--- a/chrome/gpu_unittests.isolate
+++ b/chrome/gpu_unittests.isolate
@@ -11,7 +11,7 @@
         'command': [
           '<(PRODUCT_DIR)/gpu_unittests<(EXECUTABLE_SUFFIX)',
         ],
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/gpu_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index 2fba2e0..c2bb835 100644
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -294,7 +294,6 @@
               ],
               'includes': [
                 '../../build/isolate.gypi',
-                'mini_installer_tests.isolate',
               ],
               'sources': [
                 'mini_installer_tests.isolate',
diff --git a/chrome/installer/mini_installer_tests.isolate b/chrome/installer/mini_installer_tests.isolate
index 83aa7ea..480b704 100644
--- a/chrome/installer/mini_installer_tests.isolate
+++ b/chrome/installer/mini_installer_tests.isolate
@@ -13,11 +13,9 @@
           '--target=Release',
           '--force-clean',
         ],
-        'isolate_dependency_tracked': [
-          '<(PRODUCT_DIR)/mini_installer.exe',
-        ],
-        'isolate_dependency_untracked': [
+        'files': [
           '../test/mini_installer/',
+          '<(PRODUCT_DIR)/mini_installer.exe',
         ],
       },
     }],
diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate
index 04f6cc2..645d83c 100644
--- a/chrome/interactive_ui_tests.isolate
+++ b/chrome/interactive_ui_tests.isolate
@@ -12,36 +12,32 @@
           '--test-launcher-bot-mode',
           '--lsan=<(lsan)',
         ],
-        'isolate_dependency_tracked': [
+        'files': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/libosmesa.so',
-        ],
-        'isolate_dependency_untracked': [
           '<(PRODUCT_DIR)/pyproto/',
         ],
       },
     }],
     ['OS=="linux" and use_ozone==0', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
-        'isolate_dependency_tracked': [
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
-          '<(PRODUCT_DIR)/resources.pak',
-        ],
-        'isolate_dependency_untracked': [
+        'files': [
           '../net/data/ssl/certificates/',
           '../net/tools/testserver/',
+          '../testing/test_env.py',
           '../third_party/pyftpdlib/',
           '../third_party/pywebsocket/',
           '../third_party/tlslite/',
+          '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/resources.pak',
           'test/data/',
         ],
         'read_only': 1,
@@ -49,7 +45,7 @@
     }],
     ['OS=="linux" or OS=="win"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/chrome_100_percent.pak',
           '<(PRODUCT_DIR)/locales/en-US.pak',
           '<(PRODUCT_DIR)/locales/fr.pak',
@@ -59,13 +55,11 @@
     }],
     ['OS=="mac"', {
       'variables': {
-        'isolate_dependency_tracked': [
-          '<(PRODUCT_DIR)/ffmpegsumo.so',
-          '<(PRODUCT_DIR)/osmesa.so',
-        ],
-        'isolate_dependency_untracked': [
+        'files': [
           '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
           '<(PRODUCT_DIR)/<(mac_product_name).app/',
+          '<(PRODUCT_DIR)/ffmpegsumo.so',
+          '<(PRODUCT_DIR)/osmesa.so',
         ],
       },
     }],
@@ -80,36 +74,32 @@
     }],
     ['OS=="win"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/chrome_elf.dll',
           '<(PRODUCT_DIR)/d3dcompiler_46.dll',
           '<(PRODUCT_DIR)/ffmpegsumo.dll',
           '<(PRODUCT_DIR)/libEGL.dll',
           '<(PRODUCT_DIR)/libGLESv2.dll',
           '<(PRODUCT_DIR)/osmesa.dll',
-        ],
-        'isolate_dependency_untracked': [
           '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll',
         ],
       },
     }],
     ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
       'variables': {
-        'isolate_dependency_untracked': [
+        'files': [
           '<(PRODUCT_DIR)/interactive_ui_tests.exe.pdb',
         ],
       },
     }],
     ['chromeos==1', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
+          '../google_apis/test/',
           '<(PRODUCT_DIR)/keyboard_resources.pak',
           '<(PRODUCT_DIR)/libexif.so',
           '<(PRODUCT_DIR)/nacl_helper',
           '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
-        ],
-        'isolate_dependency_untracked': [
-          '../google_apis/test/',
           '<(PRODUCT_DIR)/resources/chromeos/',
         ],
       },
diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate
index 7901d5b..03b0e59 100644
--- a/chrome/sync_integration_tests.isolate
+++ b/chrome/sync_integration_tests.isolate
@@ -11,7 +11,7 @@
           '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)',
           '--test-launcher-bot-mode',
         ],
-        'isolate_dependency_tracked': [
+        'files': [
           '../testing/test_env.py',
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
@@ -21,14 +21,14 @@
     }],
     ['OS=="linux" and use_ozone==0', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
     ['OS=="linux" or OS=="win"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/chrome_100_percent.pak',
           '<(PRODUCT_DIR)/locales/en-US.pak',
         ],
@@ -36,18 +36,16 @@
     }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
-        'isolate_dependency_tracked': [
-          '<(PRODUCT_DIR)/resources.pak',
-          '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)',
-        ],
-        'isolate_dependency_untracked': [
+        'files': [
           '../chrome/test/data/sync/',
           '../net/tools/testserver/',
           '../sync/tools/testserver/',
-          '../third_party/tlslite/',
           '../third_party/pyftpdlib/',
           '../third_party/pywebsocket/',
+          '../third_party/tlslite/',
           '<(PRODUCT_DIR)/pyproto/',
+          '<(PRODUCT_DIR)/resources.pak',
+          '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
@@ -61,18 +59,16 @@
     }],
     ['OS=="mac"', {
       'variables': {
-        'isolate_dependency_tracked': [
-          '<(PRODUCT_DIR)/ffmpegsumo.so',
-        ],
-        'isolate_dependency_untracked': [
+        'files': [
           '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
           '<(PRODUCT_DIR)/<(mac_product_name).app/',
+          '<(PRODUCT_DIR)/ffmpegsumo.so',
         ],
       },
     }],
     ['OS=="win"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/chrome_elf.dll',
           '<(PRODUCT_DIR)/ffmpegsumo.dll',
         ],
@@ -80,14 +76,14 @@
     }],
     ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
       'variables': {
-        'isolate_dependency_untracked': [
+        'files': [
           '<(PRODUCT_DIR)/sync_integration_tests.exe.pdb',
         ],
       },
     }],
     ['chromeos==1', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/libexif.so',
         ],
       },
diff --git a/chrome/tab_capture_end2end_tests.isolate b/chrome/tab_capture_end2end_tests.isolate
index 1a3e9fe..5f686e0 100644
--- a/chrome/tab_capture_end2end_tests.isolate
+++ b/chrome/tab_capture_end2end_tests.isolate
@@ -16,7 +16,7 @@
           '--test-launcher-jobs=1',
           '--gtest_filter=TabCaptureApiPixelTest.EndToEnd*',
         ],
-        'isolate_dependency_untracked': [
+        'files': [
           'test/data/extensions/api_test/tab_capture/',
         ],
       },
diff --git a/chrome/telemetry.isolate b/chrome/telemetry.isolate
index 05a00a9..0fb220b 100644
--- a/chrome/telemetry.isolate
+++ b/chrome/telemetry.isolate
@@ -19,20 +19,18 @@
       # Note that the dependency on ../build/android/ was made more
       # precise to ../build/android/pylib/.
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
+          '../build/android/pylib/',
+          '../build/util/',
           '../third_party/WebKit/PerformanceTests/resources/jquery.tablesorter.min.js',
           '../third_party/WebKit/PerformanceTests/resources/statistics.js',
+          '../third_party/android_testrunner/',
           '../third_party/flot/jquery.flot.min.js',
-          '../tools/perf/unit-info.json',
-          '<(PRODUCT_DIR)/bitmaptools<(EXECUTABLE_SUFFIX)',
-        ],
-        'isolate_dependency_untracked': [
-          '../build/android/pylib/',
-          '../build/util/',
+          '../third_party/webpagereplay/',
           '../tools/crx_id/',
+          '../tools/perf/unit-info.json',
           '../tools/telemetry/',
-          '../third_party/android_testrunner/',
-          '../third_party/webpagereplay/',
+          '<(PRODUCT_DIR)/bitmaptools<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/chrome/telemetry_gpu_test.isolate b/chrome/telemetry_gpu_test.isolate
index 84f262c..a82dc0d 100644
--- a/chrome/telemetry_gpu_test.isolate
+++ b/chrome/telemetry_gpu_test.isolate
@@ -11,7 +11,7 @@
       # conformance tests, to be run. However, extra command line arguments
       # must be supplied in order to run any one of them.
       'variables': {
-        'isolate_dependency_untracked': [
+        'files': [
           '../content/test/gpu/',
           '../content/test/data/gpu/',
           # For GpuProcess.video
@@ -28,14 +28,14 @@
     # an assertion fires or a crash occurs. Add more as necessary.
     ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/chrome.exe.pdb',
         ],
       },
     }],
     ['OS=="win" and component=="shared_library" and (fastbuild==0 or fastbuild==1)', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/base.dll.pdb',
           '<(PRODUCT_DIR)/blink_platform.dll.pdb',
           '<(PRODUCT_DIR)/blink_web.dll.pdb',
diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
index a69b4a3..483a9f6 100644
--- a/chrome/unit_tests.isolate
+++ b/chrome/unit_tests.isolate
@@ -5,25 +5,23 @@
   'conditions': [
     ['OS=="android" or OS=="linux"', {
       'variables': {
-        'isolate_dependency_untracked': [
+        'files': [
           '<(PRODUCT_DIR)/test_data/',
         ],
       },
     }],
     ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
-        'isolate_dependency_tracked': [
-          '../third_party/accessibility-audit/axs_testing.js',
-          '../tools/metrics/histograms/histograms.xml',
-          '<(PRODUCT_DIR)/resources.pak',
-        ],
-        'isolate_dependency_untracked': [
+        'files': [
           '../base/test/data/',
           '../components/test/data/',
           '../extensions/test/data/',
           '../net/data/',
+          '../third_party/accessibility-audit/axs_testing.js',
           '../third_party/hunspell_dictionaries/',
           '../third_party/zlib/google/test/data/',
+          '../tools/metrics/histograms/histograms.xml',
+          '<(PRODUCT_DIR)/resources.pak',
           'test/data/',
           'third_party/mock4js/',
         ],
@@ -31,7 +29,7 @@
     }],
     ['OS=="android" or OS=="linux" or OS=="win"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/chrome_100_percent.pak',
           '<(PRODUCT_DIR)/locales/en-US.pak',
         ],
@@ -46,7 +44,7 @@
           '--brave-new-test-launcher',
           '--test-launcher-bot-mode',
         ],
-        'isolate_dependency_tracked': [
+        'files': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/libosmesa.so',
@@ -56,24 +54,22 @@
     }],
     ['OS=="linux" and use_ozone==0', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
-        'isolate_dependency_tracked': [
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
-        ],
-        'isolate_dependency_untracked': [
+        'files': [
           '../net/tools/testserver/',
+          '../testing/test_env.py',
           '../third_party/pyftpdlib/',
           '../third_party/pywebsocket/',
           '../third_party/tlslite/',
           '<(PRODUCT_DIR)/pyproto/',
           '<(PRODUCT_DIR)/test_data/',
+          '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
@@ -85,14 +81,12 @@
     }],
     ['OS=="mac"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
+          '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
           '<(PRODUCT_DIR)/exif.so',
           '<(PRODUCT_DIR)/ffmpegsumo.so',
           '<(PRODUCT_DIR)/osmesa.so',
         ],
-        'isolate_dependency_untracked': [
-          '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
-        ],
       },
     }],
     ['OS=="mac" or OS=="win"', {
@@ -107,7 +101,10 @@
     }],
     ['OS=="win"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
+          '../ppapi/lib/gl/include/KHR/',
+          '../skia/ext/data/',
+          '../ui/base/glib/',
           '<(PRODUCT_DIR)/blacklist_test_dll_1.dll',
           '<(PRODUCT_DIR)/chrome_elf.dll',
           '<(PRODUCT_DIR)/ffmpegsumo.dll',
@@ -117,27 +114,20 @@
           '<(PRODUCT_DIR)/verifier_test_dll_2.dll',
           'test/data/safe_browsing/signed_binary.dll',
         ],
-        'isolate_dependency_untracked': [
-          '../ppapi/lib/gl/include/KHR/',
-          '../skia/ext/data/',
-          '../ui/base/glib/',
-        ],
       },
     }],
     ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
       'variables': {
-        'isolate_dependency_untracked': [
+        'files': [
           '<(PRODUCT_DIR)/unit_tests.exe.pdb',
         ],
       },
     }],
     ['chromeos==1', {
       'variables': {
-        'isolate_dependency_tracked': [
-          '<(PRODUCT_DIR)/libexif.so',
-        ],
-        'isolate_dependency_untracked': [
+        'files': [
           '../chromeos/test/data/network/',
+          '<(PRODUCT_DIR)/libexif.so',
         ],
       },
     }],