Revert of Fix sbox_validation_tests & Make isolate_driver.py include the executable itself (patchset #3 id:90001 of https://codereview.chromium.org/1245873002/ )

Reason for revert:
This CL seems to break compile http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Linux%20x64/builds/3900/.

If the revert doesn't fix it, I will re-land this CL.

Original issue's description:
> Fix sbox_validation_tests & Make isolate_driver.py include the executable itself
>
> Further reduce the boilerplate in .isolate files and is necessary to add debug
> symbols, to be done in a follow up.
>
> Slightly accelerate ninja file parsing by blacklisting more extensions.
>
> sbox_validation_tests wasn't run on Windows since
> https://codereview.chromium.org/1212003003/ (~2 months ago). Thankfully this CL
> uncovered this copy-paste error.
>
> TBR=jam@chromium.org
> BUG=98637
> CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
>
> Committed: https://crrev.com/c6649f2e014a24a9093140a06fcadcaf2a06513c
> Cr-Commit-Position: refs/heads/master@{#347027}

TBR=jam@chromium.org,maruel@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=98637

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

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

70 files changed, 100 insertions, 8 deletions

diff --git a/ash/ash_unittests.isolate b/ash/ash_unittests.isolate
index 94f9ea8..30039bb 100644
--- a/ash/ash_unittests.isolate
+++ b/ash/ash_unittests.isolate
@@ -30,6 +30,7 @@
       'variables': {
         'files': [
           '../testing/test_env.py',
+          '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/chrome_100_percent.pak',
           '<(PRODUCT_DIR)/chrome_200_percent.pak',
           '<(PRODUCT_DIR)/locales/en-US.pak',
diff --git a/base/base_unittests.isolate b/base/base_unittests.isolate
index 208501f..c4c0fb2 100644
--- a/base/base_unittests.isolate
+++ b/base/base_unittests.isolate
@@ -25,6 +25,7 @@
       'variables': {
         'files': [
           '../testing/test_env.py',
+          '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/cc/cc_unittests.isolate b/cc/cc_unittests.isolate
index 09bfcf9..6576a50 100644
--- a/cc/cc_unittests.isolate
+++ b/cc/cc_unittests.isolate
@@ -39,6 +39,7 @@
         'files': [
           'test/data/',
           '../testing/test_env.py',
+          '<(PRODUCT_DIR)/cc_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/chrome/angle_deqp_gles2_tests.isolate b/chrome/angle_deqp_gles2_tests.isolate
index caa4edf..782ffde 100644
--- a/chrome/angle_deqp_gles2_tests.isolate
+++ b/chrome/angle_deqp_gles2_tests.isolate
@@ -15,6 +15,7 @@
           '--test-launcher-batch-limit=400',
         ],
         'files': [
+          '<(PRODUCT_DIR)/angle_deqp_gles2_tests<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/deqp_support/deqp_gles2_test_expectations.txt',
           '<(PRODUCT_DIR)/deqp_support/dEQP-GLES2-cases.txt.gz',
           '../third_party/deqp/src/data/',
diff --git a/chrome/angle_end2end_tests.isolate b/chrome/angle_end2end_tests.isolate
index e278003..c2cbdd8 100644
--- a/chrome/angle_end2end_tests.isolate
+++ b/chrome/angle_end2end_tests.isolate
@@ -12,6 +12,9 @@
         'command': [
           '<(PRODUCT_DIR)/angle_end2end_tests<(EXECUTABLE_SUFFIX)',
         ],
+        'files': [
+          '<(PRODUCT_DIR)/angle_end2end_tests<(EXECUTABLE_SUFFIX)',
+        ],
       },
     }],
   ],
diff --git a/chrome/angle_unittests.isolate b/chrome/angle_unittests.isolate
index a62e258..7205ea3 100644
--- a/chrome/angle_unittests.isolate
+++ b/chrome/angle_unittests.isolate
@@ -11,6 +11,9 @@
         'command': [
           '<(PRODUCT_DIR)/angle_unittests<(EXECUTABLE_SUFFIX)',
         ],
+        'files': [
+          '<(PRODUCT_DIR)/angle_unittests<(EXECUTABLE_SUFFIX)',
+        ],
       },
     }],
     ['OS=="mac" and asan==1 and fastbuild==0', {
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
index 26218a2..ca17792 100644
--- a/chrome/browser_tests.isolate
+++ b/chrome/browser_tests.isolate
@@ -71,6 +71,7 @@
           '../third_party/safe_browsing/',
           '../third_party/simplejson/',
           '../third_party/tlslite/',
+          '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/browser_tests.pak',
           '<(PRODUCT_DIR)/pseudo_locales/',
           '<(PRODUCT_DIR)/pyproto/',
diff --git a/chrome/chromedriver_unittests.isolate b/chrome/chromedriver_unittests.isolate
index 7584809..4d5fea4 100644
--- a/chrome/chromedriver_unittests.isolate
+++ b/chrome/chromedriver_unittests.isolate
@@ -36,6 +36,7 @@
       'variables': {
         'files': [
           '../testing/test_env.py',
+          '<(PRODUCT_DIR)/chromedriver_unittests<(EXECUTABLE_SUFFIX)',
           'test/data/chromedriver/',
         ],
       },
diff --git a/chrome/gl_tests.isolate b/chrome/gl_tests.isolate
index 797e537..a880f9a 100644
--- a/chrome/gl_tests.isolate
+++ b/chrome/gl_tests.isolate
@@ -12,6 +12,9 @@
         'command': [
           '<(PRODUCT_DIR)/gl_tests<(EXECUTABLE_SUFFIX)',
         ],
+        'files': [
+          '<(PRODUCT_DIR)/gl_tests<(EXECUTABLE_SUFFIX)',
+        ],
       },
     }],
   ],
diff --git a/chrome/gles2_conform_test.isolate b/chrome/gles2_conform_test.isolate
index a041d1c9..3dd74a1 100644
--- a/chrome/gles2_conform_test.isolate
+++ b/chrome/gles2_conform_test.isolate
@@ -14,6 +14,7 @@
           '<(PRODUCT_DIR)/gles2_conform_test<(EXECUTABLE_SUFFIX)',
         ],
         'files': [
+          '<(PRODUCT_DIR)/gles2_conform_test<(EXECUTABLE_SUFFIX)',
           '../gpu/gles2_conform_support/gles2_conform_test_expectations.txt',
         ],
       },
diff --git a/chrome/installer_util_unittests.isolate b/chrome/installer_util_unittests.isolate
index 68e61f4..d2b04c0 100644
--- a/chrome/installer_util_unittests.isolate
+++ b/chrome/installer_util_unittests.isolate
@@ -9,6 +9,7 @@
           '<(PRODUCT_DIR)/installer_util_unittests.exe',
         ],
         'files': [
+          '<(PRODUCT_DIR)/installer_util_unittests.exe',
           'test/data/extensions/',
           'test/data/installer/',
         ],
diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate
index fbb78b2..6dfc1fc 100644
--- a/chrome/interactive_ui_tests.isolate
+++ b/chrome/interactive_ui_tests.isolate
@@ -54,6 +54,7 @@
           '../third_party/pyftpdlib/',
           '../third_party/pywebsocket/',
           '../third_party/tlslite/',
+          '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/resources.pak',
           '<(PRODUCT_DIR)/ui_test.pak',
           'test/data/',
diff --git a/chrome/setup_unittests.isolate b/chrome/setup_unittests.isolate
index 3f6e56d..5b10de8 100644
--- a/chrome/setup_unittests.isolate
+++ b/chrome/setup_unittests.isolate
@@ -9,6 +9,7 @@
           '<(PRODUCT_DIR)/setup_unittests.exe',
         ],
         'files': [
+          '<(PRODUCT_DIR)/setup_unittests.exe',
           'installer/test/data/',
           'test/data/installer/',
         ],
diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate
index 70721f1..6c7e6fc 100644
--- a/chrome/sync_integration_tests.isolate
+++ b/chrome/sync_integration_tests.isolate
@@ -52,6 +52,7 @@
           '../third_party/tlslite/',
           '<(PRODUCT_DIR)/pyproto/',
           '<(PRODUCT_DIR)/resources.pak',
+          '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
index a3bff84..ad2aa01 100644
--- a/chrome/unit_tests.isolate
+++ b/chrome/unit_tests.isolate
@@ -88,6 +88,7 @@
           '../third_party/pywebsocket/',
           '../third_party/tlslite/',
           '<(PRODUCT_DIR)/pyproto/google/',
+          '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/chromeos/chromeos_unittests.isolate b/chromeos/chromeos_unittests.isolate
index f2d5f98..11648bf 100644
--- a/chromeos/chromeos_unittests.isolate
+++ b/chromeos/chromeos_unittests.isolate
@@ -15,6 +15,7 @@
     'files': [
       '../net/data/',
       '../testing/test_env.py',
+      '<(PRODUCT_DIR)/chromeos_unittests<(EXECUTABLE_SUFFIX)',
       'test/data/',
     ],
   },
diff --git a/components/components_browsertests.isolate b/components/components_browsertests.isolate
index c3ed0b4..a96725e 100644
--- a/components/components_browsertests.isolate
+++ b/components/components_browsertests.isolate
@@ -46,6 +46,7 @@
       'variables': {
         'files': [
           '../testing/test_env.py',
+          '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/components_tests_resources.pak',
           '<(PRODUCT_DIR)/content_shell.pak',
         ],
diff --git a/components/components_unittests.isolate b/components/components_unittests.isolate
index f2b37698..dda3761 100644
--- a/components/components_unittests.isolate
+++ b/components/components_unittests.isolate
@@ -47,6 +47,7 @@
       'variables': {
         'files': [
           '../testing/test_env.py',
+          '<(PRODUCT_DIR)/components_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/components/nacl_loader_unittests.isolate b/components/nacl_loader_unittests.isolate
index 4a6fe8c..99ad71a 100644
--- a/components/nacl_loader_unittests.isolate
+++ b/components/nacl_loader_unittests.isolate
@@ -8,6 +8,9 @@
         'command': [
           '<(PRODUCT_DIR)/nacl_loader_unittests<(EXECUTABLE_SUFFIX)',
         ],
+        'files': [
+          '<(PRODUCT_DIR)/nacl_loader_unittests<(EXECUTABLE_SUFFIX)',
+        ],
       },
     }],
   ],
diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate
index 97714d7..2ebd3e8 100644
--- a/content/content_browsertests.isolate
+++ b/content/content_browsertests.isolate
@@ -93,6 +93,7 @@
           '../third_party/pyftpdlib/',
           '../third_party/pywebsocket/',
           '../third_party/tlslite/',
+          '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/content/content_gl_tests.isolate b/content/content_gl_tests.isolate
index 11e4736..e9626a6 100644
--- a/content/content_gl_tests.isolate
+++ b/content/content_gl_tests.isolate
@@ -8,6 +8,9 @@
         'command': [
           '<(PRODUCT_DIR)/content_gl_tests<(EXECUTABLE_SUFFIX)',
         ],
+        'files': [
+          '<(PRODUCT_DIR)/content_gl_tests<(EXECUTABLE_SUFFIX)',
+        ],
       },
     }],
     # TODO(kbr): these two dependencies seem to be necessary when
diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate
index b2fde54..cc6622c 100644
--- a/content/content_unittests.isolate
+++ b/content/content_unittests.isolate
@@ -61,6 +61,7 @@
       'variables': {
         'files': [
           '../testing/test_env.py',
+          '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/courgette/courgette_unittests.isolate b/courgette/courgette_unittests.isolate
index 956bca7..be8aa6c 100644
--- a/courgette/courgette_unittests.isolate
+++ b/courgette/courgette_unittests.isolate
@@ -4,6 +4,7 @@
 {
   'variables': {
     'files': [
+      '<(PRODUCT_DIR)/courgette_unittests<(EXECUTABLE_SUFFIX)',
       'testdata/',
     ],
     'command': [
diff --git a/crypto/crypto_unittests.isolate b/crypto/crypto_unittests.isolate
index de13aa2..619153f 100644
--- a/crypto/crypto_unittests.isolate
+++ b/crypto/crypto_unittests.isolate
@@ -18,6 +18,7 @@
       'variables': {
         'files': [
           '../testing/test_env.py',
+          '<(PRODUCT_DIR)/crypto_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/device/device_unittests.isolate b/device/device_unittests.isolate
index f780252..21f3876 100644
--- a/device/device_unittests.isolate
+++ b/device/device_unittests.isolate
@@ -18,6 +18,7 @@
       'variables': {
         'files': [
           '../testing/test_env.py',
+          '<(PRODUCT_DIR)/device_unittests<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/usb_gadget.zip',
           '<(PRODUCT_DIR)/usb_gadget.zip.md5',
         ],
diff --git a/extensions/extensions_browsertests.isolate b/extensions/extensions_browsertests.isolate
index 6ceb284..a060728 100644
--- a/extensions/extensions_browsertests.isolate
+++ b/extensions/extensions_browsertests.isolate
@@ -42,6 +42,7 @@
           '../third_party/pyftpdlib/',
           '../third_party/pywebsocket/',
           '../third_party/tlslite/',
+          '<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/extensions_shell_and_test.pak',
           'test/data/',
         ],
diff --git a/extensions/extensions_unittests.isolate b/extensions/extensions_unittests.isolate
index 8c10cccc..b17b435 100644
--- a/extensions/extensions_unittests.isolate
+++ b/extensions/extensions_unittests.isolate
@@ -39,6 +39,7 @@
         'files': [
           '../chrome/test/data/extensions/',
           '../testing/test_env.py',
+          '<(PRODUCT_DIR)/extensions_unittests<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/extensions_shell_and_test.pak',
           'test/data/',
         ],
diff --git a/extensions/shell/app_shell_unittests.isolate b/extensions/shell/app_shell_unittests.isolate
index ca5a444..a1d66fe 100644
--- a/extensions/shell/app_shell_unittests.isolate
+++ b/extensions/shell/app_shell_unittests.isolate
@@ -39,6 +39,7 @@
         'files': [
           '../../testing/test_env.py',
           '../test/data/',
+          '<(PRODUCT_DIR)/app_shell_unittests<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/extensions_shell_and_test.pak',
         ],
       },
diff --git a/google_apis/gcm/gcm_unit_tests.isolate b/google_apis/gcm/gcm_unit_tests.isolate
index ecd9dd2..cf5b302 100644
--- a/google_apis/gcm/gcm_unit_tests.isolate
+++ b/google_apis/gcm/gcm_unit_tests.isolate
@@ -16,6 +16,7 @@
         ],
         'files': [
           '../../testing/test_env.py',
+          '<(PRODUCT_DIR)/gcm_unit_tests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/google_apis/google_apis_unittests.isolate b/google_apis/google_apis_unittests.isolate
index 5d9e22e..26a84d2 100644
--- a/google_apis/google_apis_unittests.isolate
+++ b/google_apis/google_apis_unittests.isolate
@@ -16,6 +16,7 @@
         ],
         'files': [
           '../testing/test_env.py',
+          '<(PRODUCT_DIR)/google_apis_unittests<(EXECUTABLE_SUFFIX)',
           'test/',
         ],
       },
diff --git a/gpu/gpu_unittests.isolate b/gpu/gpu_unittests.isolate
index 91eafce..ad0fd2c 100644
--- a/gpu/gpu_unittests.isolate
+++ b/gpu/gpu_unittests.isolate
@@ -38,6 +38,7 @@
       'variables': {
         'files': [
           '../testing/test_env.py',
+          '<(PRODUCT_DIR)/gpu_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/ipc/ipc_tests.isolate b/ipc/ipc_tests.isolate
index 5a8c93a..ce9d3d6 100644
--- a/ipc/ipc_tests.isolate
+++ b/ipc/ipc_tests.isolate
@@ -16,6 +16,7 @@
         ],
         'files': [
           '../testing/test_env.py',
+          '<(PRODUCT_DIR)/ipc_tests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/jingle/jingle_unittests.isolate b/jingle/jingle_unittests.isolate
index c05a0ff..625ac92 100644
--- a/jingle/jingle_unittests.isolate
+++ b/jingle/jingle_unittests.isolate
@@ -16,6 +16,7 @@
         ],
         'files': [
           '../testing/test_env.py',
+          '<(PRODUCT_DIR)/jingle_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/media/audio_unittests.isolate b/media/audio_unittests.isolate
index 8baf2df..d91c636 100644
--- a/media/audio_unittests.isolate
+++ b/media/audio_unittests.isolate
@@ -48,6 +48,7 @@
       'variables': {
         'files': [
           '../testing/test_env.py',
+          '<(PRODUCT_DIR)/audio_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/media/cast/cast_unittests.isolate b/media/cast/cast_unittests.isolate
index 2d61c78..bf207cd 100644
--- a/media/cast/cast_unittests.isolate
+++ b/media/cast/cast_unittests.isolate
@@ -38,6 +38,7 @@
       'variables': {
         'files': [
           '../../testing/test_env.py',
+          '<(PRODUCT_DIR)/cast_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/media/media_unittests.isolate b/media/media_unittests.isolate
index 67c1da5..7c0d4e4 100644
--- a/media/media_unittests.isolate
+++ b/media/media_unittests.isolate
@@ -48,6 +48,7 @@
       'variables': {
         'files': [
           '../testing/test_env.py',
+          '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/media/midi/midi_unittests.isolate b/media/midi/midi_unittests.isolate
index bfbec4c..dca0d35 100644
--- a/media/midi/midi_unittests.isolate
+++ b/media/midi/midi_unittests.isolate
@@ -41,6 +41,7 @@
       'variables': {
         'files': [
           '../../testing/test_env.py',
+          '<(PRODUCT_DIR)/midi_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/mojo/mojo_common_unittests.isolate b/mojo/mojo_common_unittests.isolate
index 8fe9d31..8140ece 100644
--- a/mojo/mojo_common_unittests.isolate
+++ b/mojo/mojo_common_unittests.isolate
@@ -16,6 +16,7 @@
         ],
         'files': [
           '../testing/test_env.py',
+          '<(PRODUCT_DIR)/mojo_common_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/mojo/mojo_js_unittests.isolate b/mojo/mojo_js_unittests.isolate
index c628388..e18bf62 100644
--- a/mojo/mojo_js_unittests.isolate
+++ b/mojo/mojo_js_unittests.isolate
@@ -18,6 +18,7 @@
           '../gin/test/expect.js',
           '../testing/test_env.py',
           '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/',
+          '<(PRODUCT_DIR)/mojo_js_unittests<(EXECUTABLE_SUFFIX)',
           'bindings/js/',
           'public/js/bindings/',
         ],
diff --git a/net/net_unittests.isolate b/net/net_unittests.isolate
index 4c7733b..b679490 100644
--- a/net/net_unittests.isolate
+++ b/net/net_unittests.isolate
@@ -26,6 +26,7 @@
           '../third_party/pyftpdlib/',
           '../third_party/pywebsocket/',
           '../third_party/tlslite/',
+          '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/pyproto/google/',
           'tools/testserver/',
         ],
diff --git a/printing/printing_unittests.isolate b/printing/printing_unittests.isolate
index 291e983..e0ab01b 100644
--- a/printing/printing_unittests.isolate
+++ b/printing/printing_unittests.isolate
@@ -16,6 +16,7 @@
         ],
         'files': [
           '../testing/test_env.py',
+          '<(PRODUCT_DIR)/printing_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/remoting/remoting_unittests.isolate b/remoting/remoting_unittests.isolate
index 77f78e4..ed6fca8 100644
--- a/remoting/remoting_unittests.isolate
+++ b/remoting/remoting_unittests.isolate
@@ -19,6 +19,7 @@
           '../net/data/ssl/certificates/unittest.key.bin',
           '../net/data/ssl/certificates/unittest.selfsigned.der',
           '../testing/test_env.py',
+          '<(PRODUCT_DIR)/remoting_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/sandbox/sandbox_linux_unittests.isolate b/sandbox/sandbox_linux_unittests.isolate
index 2b7c2a7..79700f6 100644
--- a/sandbox/sandbox_linux_unittests.isolate
+++ b/sandbox/sandbox_linux_unittests.isolate
@@ -12,6 +12,9 @@
         'command': [
           '<(PRODUCT_DIR)/sandbox_linux_unittests',
         ],
+        'files': [
+          '<(PRODUCT_DIR)/sandbox_linux_unittests',
+        ],
       },
     }],
   ],
diff --git a/sandbox/sandbox_mac_unittests.isolate b/sandbox/sandbox_mac_unittests.isolate
index a202a9b..dd1130b 100644
--- a/sandbox/sandbox_mac_unittests.isolate
+++ b/sandbox/sandbox_mac_unittests.isolate
@@ -4,6 +4,7 @@
 {
   'variables': {
     'command': [ '<(PRODUCT_DIR)/sandbox_mac_unittests' ],
+    'files': [ '<(PRODUCT_DIR)/sandbox_mac_unittests' ],
   },
   'includes': [ '../base/base.isolate' ],
 }
diff --git a/sandbox/sbox_integration_tests.isolate b/sandbox/sbox_integration_tests.isolate
index 719cd38..00befe0 100644
--- a/sandbox/sbox_integration_tests.isolate
+++ b/sandbox/sbox_integration_tests.isolate
@@ -12,6 +12,9 @@
         'command': [
           '<(PRODUCT_DIR)/sbox_integration_tests.exe',
         ],
+        'files': [
+          '<(PRODUCT_DIR)/sbox_integration_tests.exe',
+        ],
       },
     }],
     ['OS=="win" and target_arch=="ia32"', {
diff --git a/sandbox/sbox_unittests.isolate b/sandbox/sbox_unittests.isolate
index e6dec256..578835a 100644
--- a/sandbox/sbox_unittests.isolate
+++ b/sandbox/sbox_unittests.isolate
@@ -12,6 +12,9 @@
         'command': [
           '<(PRODUCT_DIR)/sbox_unittests.exe',
         ],
+        'files': [
+          '<(PRODUCT_DIR)/sbox_unittests.exe',
+        ],
       },
     }],
     ['OS=="win" and target_arch=="ia32"', {
diff --git a/sandbox/sbox_validation_tests.isolate b/sandbox/sbox_validation_tests.isolate
index 4daee6b..578835a 100644
--- a/sandbox/sbox_validation_tests.isolate
+++ b/sandbox/sbox_validation_tests.isolate
@@ -10,7 +10,10 @@
     ['OS=="win"', {
       'variables': {
         'command': [
-          '<(PRODUCT_DIR)/sbox_validation_tests.exe',
+          '<(PRODUCT_DIR)/sbox_unittests.exe',
+        ],
+        'files': [
+          '<(PRODUCT_DIR)/sbox_unittests.exe',
         ],
       },
     }],
diff --git a/skia/skia_unittests.isolate b/skia/skia_unittests.isolate
index 67cea47..6dc1d9a 100644
--- a/skia/skia_unittests.isolate
+++ b/skia/skia_unittests.isolate
@@ -18,6 +18,7 @@
       'variables': {
         'files': [
           '../testing/test_env.py',
+          '<(PRODUCT_DIR)/skia_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/sql/sql_unittests.isolate b/sql/sql_unittests.isolate
index 640f832..44246d7 100644
--- a/sql/sql_unittests.isolate
+++ b/sql/sql_unittests.isolate
@@ -23,6 +23,7 @@
         ],
         'files': [
           '../testing/test_env.py',
+          '<(PRODUCT_DIR)/sql_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/sync/sync_unit_tests.isolate b/sync/sync_unit_tests.isolate
index c28ebd5..0efe659 100644
--- a/sync/sync_unit_tests.isolate
+++ b/sync/sync_unit_tests.isolate
@@ -29,6 +29,7 @@
           '../third_party/pywebsocket/',
           '../third_party/tlslite/',
           '<(PRODUCT_DIR)/pyproto/google/',
+          '<(PRODUCT_DIR)/sync_unit_tests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/third_party/cacheinvalidation/cacheinvalidation_unittests.isolate b/third_party/cacheinvalidation/cacheinvalidation_unittests.isolate
index 405f35f0..eefbeb9 100644
--- a/third_party/cacheinvalidation/cacheinvalidation_unittests.isolate
+++ b/third_party/cacheinvalidation/cacheinvalidation_unittests.isolate
@@ -9,6 +9,9 @@
           '<(PRODUCT_DIR)/cacheinvalidation_unittests<(EXECUTABLE_SUFFIX)',
           '--test-launcher-bot-mode',
         ],
+        'files': [
+          '<(PRODUCT_DIR)/cacheinvalidation_unittests<(EXECUTABLE_SUFFIX)',
+        ],
       },
     }],
   ],
diff --git a/third_party/mojo/mojo_public_bindings_unittests.isolate b/third_party/mojo/mojo_public_bindings_unittests.isolate
index e771e74..e501382 100644
--- a/third_party/mojo/mojo_public_bindings_unittests.isolate
+++ b/third_party/mojo/mojo_public_bindings_unittests.isolate
@@ -16,6 +16,7 @@
         ],
         'files': [
           '../../testing/test_env.py',
+          '<(PRODUCT_DIR)/mojo_public_bindings_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/third_party/mojo/mojo_public_environment_unittests.isolate b/third_party/mojo/mojo_public_environment_unittests.isolate
index 3f20b22..b592ed1 100644
--- a/third_party/mojo/mojo_public_environment_unittests.isolate
+++ b/third_party/mojo/mojo_public_environment_unittests.isolate
@@ -16,6 +16,7 @@
         ],
         'files': [
           '../../testing/test_env.py',
+          '<(PRODUCT_DIR)/mojo_public_environment_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/third_party/mojo/mojo_public_system_unittests.isolate b/third_party/mojo/mojo_public_system_unittests.isolate
index 083510f..2ca6626 100644
--- a/third_party/mojo/mojo_public_system_unittests.isolate
+++ b/third_party/mojo/mojo_public_system_unittests.isolate
@@ -16,6 +16,7 @@
         ],
         'files': [
           '../../testing/test_env.py',
+          '<(PRODUCT_DIR)/mojo_public_system_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/third_party/mojo/mojo_public_utility_unittests.isolate b/third_party/mojo/mojo_public_utility_unittests.isolate
index 50d5348..b42b01a 100644
--- a/third_party/mojo/mojo_public_utility_unittests.isolate
+++ b/third_party/mojo/mojo_public_utility_unittests.isolate
@@ -16,6 +16,7 @@
         ],
         'files': [
           '../../testing/test_env.py',
+          '<(PRODUCT_DIR)/mojo_public_utility_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/tools/gn/gn_unittests.isolate b/tools/gn/gn_unittests.isolate
index cada5a0..2094618 100644
--- a/tools/gn/gn_unittests.isolate
+++ b/tools/gn/gn_unittests.isolate
@@ -10,6 +10,7 @@
         ],
         'files': [
           'format_test_data/',
+          '<(PRODUCT_DIR)/gn_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/tools/isolate_driver.py b/tools/isolate_driver.py
index 3d2b755..c5d80fc 100755
--- a/tools/isolate_driver.py
+++ b/tools/isolate_driver.py
@@ -118,9 +118,9 @@ def using_blacklist(item):
   if item.endswith('.isolated.gen.json'):
     return True
   IGNORED = (
-    '.a', '.cc', '.css', '.dat', '.def', '.frag', '.h', '.html', '.isolate',
-    '.js', '.json', '.manifest', '.o', '.obj', '.pak', '.png', '.pdb', '.py',
-    '.strings', '.test', '.txt', '.vert',
+    '.a', '.cc', '.css', '.def', '.frag', '.h', '.html', '.js', '.json',
+    '.manifest', '.o', '.obj', '.pak', '.png', '.pdb', '.strings', '.test',
+    '.txt', '.vert',
   )
   # ninja files use native path format.
   ext = os.path.splitext(item)[1]
@@ -180,12 +180,11 @@ def post_process_deps(build_dir, dependencies):
       return i[:-4]
     return i
 
-  def is_exe(i):
+  def f(i):
     # This script is only for adding new binaries that are created as part of
     # the component build.
     ext = os.path.splitext(i)[1]
-    # On POSIX, executables have no extension.
-    if ext not in ('', '.dll', '.dylib', '.exe', '.nexe', '.so'):
+    if ext not in ['.dll', '.nexe', '.so', '.dylib']:
       return False
 
     # Check for execute access and strip directories. This gets rid of all the
@@ -193,7 +192,7 @@ def post_process_deps(build_dir, dependencies):
     p = os.path.join(build_dir, i)
     return os.access(p, os.X_OK) and not os.path.isdir(p)
 
-  return filter(is_exe, map(filter_item, dependencies))
+  return filter(f, map(filter_item, dependencies))
 
 
 def create_wrapper(args, isolate_index, isolated_index):
diff --git a/ui/accessibility/accessibility_unittests.isolate b/ui/accessibility/accessibility_unittests.isolate
index b2a7119..21704d6 100644
--- a/ui/accessibility/accessibility_unittests.isolate
+++ b/ui/accessibility/accessibility_unittests.isolate
@@ -8,6 +8,9 @@
         'command': [
           '<(PRODUCT_DIR)/accessibility_unittests<(EXECUTABLE_SUFFIX)',
         ],
+        'files': [
+          '<(PRODUCT_DIR)/accessibility_unittests<(EXECUTABLE_SUFFIX)',
+        ],
       },
     }],
   ],
diff --git a/ui/app_list/app_list_unittests.isolate b/ui/app_list/app_list_unittests.isolate
index d547128..e3edaa3 100644
--- a/ui/app_list/app_list_unittests.isolate
+++ b/ui/app_list/app_list_unittests.isolate
@@ -38,6 +38,7 @@
       'variables': {
         'files': [
           '../../testing/test_env.py',
+          '<(PRODUCT_DIR)/app_list_unittests<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/ui_test.pak',
         ],
       },
diff --git a/ui/aura/aura_unittests.isolate b/ui/aura/aura_unittests.isolate
index 57ee5c1..9e64db8 100644
--- a/ui/aura/aura_unittests.isolate
+++ b/ui/aura/aura_unittests.isolate
@@ -38,6 +38,7 @@
       'variables': {
         'files': [
           '../../testing/test_env.py',
+          '<(PRODUCT_DIR)/aura_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/ui/base/ui_base_unittests.isolate b/ui/base/ui_base_unittests.isolate
index d7f3950..7219748 100644
--- a/ui/base/ui_base_unittests.isolate
+++ b/ui/base/ui_base_unittests.isolate
@@ -39,6 +39,7 @@
         'files': [
           '../../testing/test_env.py',
           'test/data/data_pack_unittest/truncated-header.pak',
+          '<(PRODUCT_DIR)/ui_base_unittests<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/ui_test.pak',
         ],
       },
diff --git a/ui/compositor/compositor_unittests.isolate b/ui/compositor/compositor_unittests.isolate
index 456705e..8586bfb 100644
--- a/ui/compositor/compositor_unittests.isolate
+++ b/ui/compositor/compositor_unittests.isolate
@@ -39,6 +39,7 @@
         'files': [
           '../../testing/test_env.py',
           '../gfx/test/data/compositor/',
+          '<(PRODUCT_DIR)/compositor_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/ui/display/display_unittests.isolate b/ui/display/display_unittests.isolate
index 8122341..0f1bc46 100644
--- a/ui/display/display_unittests.isolate
+++ b/ui/display/display_unittests.isolate
@@ -16,6 +16,7 @@
         ],
         'files': [
           '../../testing/test_env.py',
+          '<(PRODUCT_DIR)/display_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/ui/events/events_unittests.isolate b/ui/events/events_unittests.isolate
index f715e7a..220d1c2 100644
--- a/ui/events/events_unittests.isolate
+++ b/ui/events/events_unittests.isolate
@@ -38,6 +38,7 @@
       'variables': {
         'files': [
           '../../testing/test_env.py',
+          '<(PRODUCT_DIR)/events_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/ui/gfx/gfx_unittests.isolate b/ui/gfx/gfx_unittests.isolate
index 3712f13..edd76be 100644
--- a/ui/gfx/gfx_unittests.isolate
+++ b/ui/gfx/gfx_unittests.isolate
@@ -10,6 +10,7 @@
         ],
         'files': [
           'test/data/',
+          '<(PRODUCT_DIR)/gfx_unittests<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/ui_test.pak',
         ],
       },
diff --git a/ui/gl/gl_unittests.isolate b/ui/gl/gl_unittests.isolate
index 9c8a2dc..e8b1d41 100644
--- a/ui/gl/gl_unittests.isolate
+++ b/ui/gl/gl_unittests.isolate
@@ -8,6 +8,9 @@
         'command': [
           '<(PRODUCT_DIR)/gl_unittests<(EXECUTABLE_SUFFIX)',
         ],
+        'files': [
+          '<(PRODUCT_DIR)/gl_unittests<(EXECUTABLE_SUFFIX)',
+        ],
       },
     }],
   ],
diff --git a/ui/message_center/message_center_unittests.isolate b/ui/message_center/message_center_unittests.isolate
index d953e9a..ef9618e 100644
--- a/ui/message_center/message_center_unittests.isolate
+++ b/ui/message_center/message_center_unittests.isolate
@@ -38,6 +38,7 @@
       'variables': {
         'files': [
           '../../testing/test_env.py',
+          '<(PRODUCT_DIR)/message_center_unittests<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/ui_test.pak',
         ],
       },
diff --git a/ui/touch_selection/ui_touch_selection_unittests.isolate b/ui/touch_selection/ui_touch_selection_unittests.isolate
index 8ef0711..3218fa4 100644
--- a/ui/touch_selection/ui_touch_selection_unittests.isolate
+++ b/ui/touch_selection/ui_touch_selection_unittests.isolate
@@ -38,6 +38,7 @@
       'variables': {
         'files': [
           '../../testing/test_env.py',
+          '<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/ui/wm/wm_unittests.isolate b/ui/wm/wm_unittests.isolate
index 5431fb9..624b760 100644
--- a/ui/wm/wm_unittests.isolate
+++ b/ui/wm/wm_unittests.isolate
@@ -39,6 +39,7 @@
         'files': [
           '../../testing/test_env.py',
           '<(PRODUCT_DIR)/ui_test.pak',
+          '<(PRODUCT_DIR)/wm_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/url/url_unittests.isolate b/url/url_unittests.isolate
index cb95014..10361f9 100644
--- a/url/url_unittests.isolate
+++ b/url/url_unittests.isolate
@@ -16,6 +16,7 @@
         ],
         'files': [
           '../testing/test_env.py',
+          '<(PRODUCT_DIR)/url_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],