Simplify isolate files a bit.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186009 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 48 insertions, 849 deletions

diff --git a/base/base_unittests.isolate b/base/base_unittests.isolate
index 614dccf..039edd6 100644
--- a/base/base_unittests.isolate
+++ b/base/base_unittests.isolate
@@ -10,8 +10,7 @@
       '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
     ],
     'isolate_dependency_untracked': [
-      'data/file_util_unittest/',
-      'data/json/',
+      'data/',
       'prefs/test/',
     ],
   },
@@ -42,8 +41,6 @@
       'variables': {
         'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/icudt.dll',
-          'data/file_version_info_unittest/FileVersionInfoTest1.dll',
-          'data/file_version_info_unittest/FileVersionInfoTest2.dll',
         ],
       },
     }],
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
index 7786d19..305513e 100644
--- a/chrome/browser_tests.isolate
+++ b/chrome/browser_tests.isolate
@@ -3,107 +3,37 @@
 # found in the LICENSE file.
 {
   'conditions': [
-    ['(OS=="linux" and chromeos==1) or ((OS=="linux" or OS=="mac" or OS=="win") and chromeos==0)', {
+    ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'isolate_dependency_tracked': [
-          '../net/data/ssl/certificates/expired_cert.pem', 
-          '../net/data/ssl/certificates/ok_cert.pem',
-          '../net/data/ssl/certificates/root_ca_cert.crt',
-          '../net/tools/testserver/asn1.py',
-          '../net/tools/testserver/echo_message.py',
-          '../net/tools/testserver/minica.py',
-          '../net/tools/testserver/testserver.py',
-          '../net/tools/testserver/testserver_base.py',
           '../ppapi/tests/test_case.html',
           '../ppapi/tests/test_page.css',
           '../testing/test_env.py',
-          '../third_party/pyftpdlib/src/pyftpdlib/__init__.py',
-          '../third_party/pyftpdlib/src/pyftpdlib/ftpserver.py',
-          '../third_party/pywebsocket/src/mod_pywebsocket/__init__.py',
-          '../third_party/pywebsocket/src/mod_pywebsocket/_stream_base.py',
-          '../third_party/pywebsocket/src/mod_pywebsocket/_stream_hixie75.py',
-          '../third_party/pywebsocket/src/mod_pywebsocket/_stream_hybi.py',
-          '../third_party/pywebsocket/src/mod_pywebsocket/common.py',
-          '../third_party/pywebsocket/src/mod_pywebsocket/dispatch.py',
-          '../third_party/pywebsocket/src/mod_pywebsocket/extensions.py',
-          '../third_party/pywebsocket/src/mod_pywebsocket/http_header_util.py',
-          '../third_party/pywebsocket/src/mod_pywebsocket/memorizingfile.py',
-          '../third_party/pywebsocket/src/mod_pywebsocket/msgutil.py',
-          '../third_party/pywebsocket/src/mod_pywebsocket/mux.py',
-          '../third_party/pywebsocket/src/mod_pywebsocket/standalone.py',
-          '../third_party/pywebsocket/src/mod_pywebsocket/stream.py',
-          '../third_party/pywebsocket/src/mod_pywebsocket/util.py',
-          '../third_party/tlslite/tlslite/BaseDB.py',
-          '../third_party/tlslite/tlslite/Checker.py',
-          '../third_party/tlslite/tlslite/FileObject.py',
-          '../third_party/tlslite/tlslite/HandshakeSettings.py',
-          '../third_party/tlslite/tlslite/Session.py',
-          '../third_party/tlslite/tlslite/SessionCache.py',
-          '../third_party/tlslite/tlslite/SharedKeyDB.py',
-          '../third_party/tlslite/tlslite/TLSConnection.py',
-          '../third_party/tlslite/tlslite/TLSRecordLayer.py',
-          '../third_party/tlslite/tlslite/VerifierDB.py',
-          '../third_party/tlslite/tlslite/X509.py',
-          '../third_party/tlslite/tlslite/X509CertChain.py',
-          '../third_party/tlslite/tlslite/__init__.py',
-          '../third_party/tlslite/tlslite/api.py',
-          '../third_party/tlslite/tlslite/constants.py',
-          '../third_party/tlslite/tlslite/errors.py',
-          '../third_party/tlslite/tlslite/integration/AsyncStateMachine.py',
-          '../third_party/tlslite/tlslite/integration/ClientHelper.py',
-          '../third_party/tlslite/tlslite/integration/HTTPTLSConnection.py',
-          '../third_party/tlslite/tlslite/integration/IMAP4_TLS.py',
-          '../third_party/tlslite/tlslite/integration/POP3_TLS.py',
-          '../third_party/tlslite/tlslite/integration/SMTP_TLS.py',
-          '../third_party/tlslite/tlslite/integration/TLSAsyncDispatcherMixIn.py',
-          '../third_party/tlslite/tlslite/integration/TLSSocketServerMixIn.py',
-          '../third_party/tlslite/tlslite/integration/XMLRPCTransport.py',
-          '../third_party/tlslite/tlslite/integration/__init__.py',
-          '../third_party/tlslite/tlslite/mathtls.py',
-          '../third_party/tlslite/tlslite/messages.py',
-          '../third_party/tlslite/tlslite/utils/AES.py',
-          '../third_party/tlslite/tlslite/utils/ASN1Parser.py',
-          '../third_party/tlslite/tlslite/utils/Python_AES.py',
-          '../third_party/tlslite/tlslite/utils/Python_RC4.py',
-          '../third_party/tlslite/tlslite/utils/Python_RSAKey.py',
-          '../third_party/tlslite/tlslite/utils/RC4.py',
-          '../third_party/tlslite/tlslite/utils/RSAKey.py',
-          '../third_party/tlslite/tlslite/utils/__init__.py',
-          '../third_party/tlslite/tlslite/utils/cipherfactory.py',
-          '../third_party/tlslite/tlslite/utils/codec.py',
-          '../third_party/tlslite/tlslite/utils/compat.py',
-          '../third_party/tlslite/tlslite/utils/cryptomath.py',
-          '../third_party/tlslite/tlslite/utils/hmac.py',
-          '../third_party/tlslite/tlslite/utils/keyfactory.py',
-          '../third_party/tlslite/tlslite/utils/rijndael.py',
-          '../third_party/tlslite/tlslite/utils/xmltools.py',
-          '../tools/swarm_client/run_isolated.py',
-          '../tools/swarm_client/run_test_cases.py',
+          'common/extensions/docs/examples/apps/calculator/app/model.js',
           '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/resources.pak',
-          'common/extensions/docs/examples/apps/calculator/app/model.js',
-          'third_party/mock4js/mock4js.js',
         ],
         'isolate_dependency_untracked': [
           '../content/test/data/',
-          '../third_party/pywebsocket/src/mod_pywebsocket/handshake/',
+          '../net/data/',
+          '../net/tools/testserver/',
+          '../third_party/pyftpdlib/',
+          '../third_party/pywebsocket/',
+          '../third_party/tlslite/',
+          '../third_party/WebKit/Tools/Scripts/',
+          '../tools/swarm_client/',
+          'common/extensions/docs/examples/apps/calculator/tests/',
+          'test/data/',
+          'third_party/mock4js/',
+          '<(PRODUCT_DIR)/pyproto/',
           '<(PRODUCT_DIR)/nacl_test_data/',
           '<(PRODUCT_DIR)/pnacl/',
           '<(PRODUCT_DIR)/pseudo_locales/',
           '<(PRODUCT_DIR)/test_data/chrome/',
-          'common/extensions/docs/examples/apps/calculator/tests/',
-          'test/data/',
-        ],
-      },
-    }],
-    ['(OS=="mac" and chromeos==0) or (OS=="linux" and (chromeos==0 or chromeos==1))', {
-      'variables': {
-        'isolate_dependency_tracked': [
-          '../third_party/tlslite/tlslite/integration/TLSTwistedProtocolWrapper.py',
         ],
       },
     }],
-    ['(OS=="mac" or OS=="win") and chromeos==0', {
+    ['OS=="mac" or OS=="win"', {
       'variables': {
         'command': [
           '../testing/test_env.py',
@@ -113,17 +43,9 @@
         ],
       },
     }],
-    ['(OS=="win" and chromeos==0) or (OS=="linux" and (chromeos==0 or chromeos==1))', {
+    ['OS=="win" or OS=="linux"', {
       'variables': {
         'isolate_dependency_tracked': [
-          '../third_party/WebKit/Tools/Scripts/new-run-webkit-websocketserver',
-          '../third_party/safe_browsing/testing/external_test_pb2.py',
-          '../third_party/safe_browsing/testing/safebrowsing_test_server.py',
-          '../third_party/safe_browsing/testing/testing_input_nomac.dat',
-          '../third_party/simplejson/__init__.py',
-          '../third_party/simplejson/decoder.py',
-          '../third_party/simplejson/encoder.py',
-          '../third_party/simplejson/scanner.py',
           '<(PRODUCT_DIR)/chrome_100_percent.pak',
           '<(PRODUCT_DIR)/locales/en-US.pak',
           '<(PRODUCT_DIR)/locales/fr.pak',
@@ -133,27 +55,6 @@
           '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc_x64.nexe',
           '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib.nmf',
           '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_x64.nexe',
-          '<(PRODUCT_DIR)/pyproto/chrome/browser/policy/proto/chrome_device_policy_pb2.py',
-          '<(PRODUCT_DIR)/pyproto/chrome/browser/policy/proto/cloud_policy_pb2.py',
-          '<(PRODUCT_DIR)/pyproto/chrome/browser/policy/proto/device_management_backend_pb2.py',
-          '<(PRODUCT_DIR)/pyproto/google/__init__.py',
-          '<(PRODUCT_DIR)/pyproto/google/protobuf/__init__.py',
-          '<(PRODUCT_DIR)/pyproto/google/protobuf/descriptor.py',
-          '<(PRODUCT_DIR)/pyproto/google/protobuf/descriptor_pb2.py',
-          '<(PRODUCT_DIR)/pyproto/google/protobuf/internal/__init__.py',
-          '<(PRODUCT_DIR)/pyproto/google/protobuf/internal/api_implementation.py',
-          '<(PRODUCT_DIR)/pyproto/google/protobuf/internal/containers.py',
-          '<(PRODUCT_DIR)/pyproto/google/protobuf/internal/decoder.py',
-          '<(PRODUCT_DIR)/pyproto/google/protobuf/internal/encoder.py',
-          '<(PRODUCT_DIR)/pyproto/google/protobuf/internal/message_listener.py',
-          '<(PRODUCT_DIR)/pyproto/google/protobuf/internal/python_message.py',
-          '<(PRODUCT_DIR)/pyproto/google/protobuf/internal/type_checkers.py',
-          '<(PRODUCT_DIR)/pyproto/google/protobuf/internal/wire_format.py',
-          '<(PRODUCT_DIR)/pyproto/google/protobuf/message.py',
-          '<(PRODUCT_DIR)/pyproto/google/protobuf/reflection.py',
-          '<(PRODUCT_DIR)/pyproto/google/protobuf/service.py',
-          '<(PRODUCT_DIR)/pyproto/google/protobuf/service_reflection.py',
-          '<(PRODUCT_DIR)/pyproto/google/protobuf/text_format.py',
           '<(PRODUCT_DIR)/test_case.html',
           '<(PRODUCT_DIR)/test_case.html.mock-http-headers',
           '<(PRODUCT_DIR)/test_page.css',
@@ -165,9 +66,10 @@
         ],
         'isolate_dependency_untracked': [
           '../net/data/websocket/',
-          '../third_party/WebKit/Tools/Scripts/webkitpy/',
           '../third_party/accessibility-developer-tools/gen/',
           '../third_party/bidichecker/',
+          '../third_party/safe_browsing/',
+          '../third_party/simplejson/',
           '<(PRODUCT_DIR)/lib64/',
           '<(PRODUCT_DIR)/plugins/',
           '<(PRODUCT_DIR)/resources/extension/',
@@ -175,7 +77,7 @@
         ],
       },
     }],
-    ['OS=="linux" and (chromeos==0 or chromeos==1)', {
+    ['OS=="linux"', {
       'variables': {
         'command': [
           '../testing/xvfb.py',
@@ -185,18 +87,7 @@
           '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
-          '../net/data/ssl/certificates/websocket_cacert.pem',
-          '../net/data/ssl/certificates/websocket_client_cert.p12',
           '../testing/xvfb.py',
-          '../third_party/WebKit/Tools/Scripts/VCSUtils.pm',
-          '../third_party/WebKit/Tools/Scripts/new-run-webkit-httpd',
-          '../third_party/WebKit/Tools/Scripts/webkit-build-directory',
-          '../third_party/WebKit/Tools/Scripts/webkitdirs.pm',
-          '../third_party/tlslite/tlslite/utils/PyCrypto_AES.py',
-          '../third_party/tlslite/tlslite/utils/PyCrypto_RC4.py',
-          '../third_party/tlslite/tlslite/utils/PyCrypto_RSAKey.py',
-          '../third_party/tlslite/tlslite/utils/PyCrypto_TripleDES.py',
-          '../third_party/tlslite/tlslite/utils/TripleDES.py',
           '<(PRODUCT_DIR)/DumpRenderTree<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/chrome.pak',
           '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)',
@@ -212,7 +103,7 @@
         ],
       },
     }],
-    ['OS=="mac" and chromeos==0', {
+    ['OS=="mac"', {
       'variables': {
         'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/ffmpegsumo.so',
@@ -228,14 +119,12 @@
         ],
       },
     }],
-    ['OS=="win" and chromeos==0', {
+    ['OS=="win"', {
       'variables': {
         'isolate_dependency_tracked': [
           '../native_client/build/build_nexe.py',
           '../third_party/cygwin/bin/bash.exe',
           '../third_party/cygwin/setup_mount.bat',
-          '../third_party/python_26/python.exe',
-          '../third_party/python_26/python26.dll',
           '<(PRODUCT_DIR)/D3DCompiler_43.dll',
           '<(PRODUCT_DIR)/ffmpegsumo.dll',
           '<(PRODUCT_DIR)/icudt.dll',
@@ -251,8 +140,7 @@
         'isolate_dependency_untracked': [
           '../third_party/npapi/npspy/extern/plugin/',
           '../third_party/psyco_win32/psyco/',
-          '../third_party/python_26/DLLs/',
-          '../third_party/python_26/Lib/',
+          '../third_party/python_26/',
           '<(PRODUCT_DIR)/gen/sdk/toolchain/win_x86_pnacl/newlib/bin/pydir/',
         ],
       },
diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate
index 82401cb..83b8ca1 100644
--- a/chrome/sync_integration_tests.isolate
+++ b/chrome/sync_integration_tests.isolate
@@ -4,8 +4,10 @@
 {
   'variables': {
     'isolate_dependency_tracked': [
-      '../tools/swarm_client/run_isolated.py',
-      '../tools/swarm_client/run_test_cases.py',
+    ],
+    'isolate_dependency_untracked': [
+      '../tools/swarm_client/',
+      '<(PRODUCT_DIR)/pyproto/',
     ],
   },
   'conditions': [
@@ -18,11 +20,6 @@
           '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
-          '../net/tools/testserver/echo_message.py',
-          '../net/tools/testserver/testserver_base.py',
-          '../sync/tools/testserver/chromiumsync.py',
-          '../sync/tools/testserver/sync_testserver.py',
-          '../sync/tools/testserver/xmppserver.py',
           '../testing/test_env.py',
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)/chrome.pak',
@@ -36,8 +33,7 @@
           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '<(PRODUCT_DIR)/pyproto/google/protobuf/',
-          '<(PRODUCT_DIR)/pyproto/sync/protocol/',
+          '../net/tools/testserver/',
         ],
       },
     }],
@@ -62,21 +58,13 @@
     }, {
       'variables': {
         'isolate_dependency_tracked': [
-          '../net/tools/testserver/',
-          '../third_party/pyftpdlib/src/pyftpdlib/ftpserver.py',
-          '../third_party/pywebsocket/src/mod_pywebsocket/',
-          '../third_party/tlslite/tlslite/',
-          '<(PRODUCT_DIR)/pyproto/google/__init__.py',
-          '<(PRODUCT_DIR)/pyproto/google/protobuf/',
-          '<(PRODUCT_DIR)/pyproto/sync/protocol/',
           '<(PRODUCT_DIR)/resources.pak',
           '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../third_party/pywebsocket/src/mod_pywebsocket/handshake/',
-        ],
-        'isolate_dependency_touched': [
-          '../third_party/pyftpdlib/src/pyftpdlib/__init__.py',
+          '../third_party/pyftpdlib/',
+          '../third_party/pywebsocket/',
+          '../third_party/tlslite/',
         ],
       },
     }],
diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
index 184074a..b555391 100644
--- a/chrome/unit_tests.isolate
+++ b/chrome/unit_tests.isolate
@@ -4,91 +4,22 @@
 {
   'variables': {
     'isolate_dependency_tracked': [
-      '../base/prefs/test/data/pref_service/invalid.json',
-      '../base/prefs/test/data/pref_service/read.json',
-      '../base/prefs/test/data/pref_service/read.need_empty_value.json',
-      '../base/prefs/test/data/pref_service/write.golden.json',
-      '../base/prefs/test/data/pref_service/write.golden.need_empty_value.json',
-      '../net/data/ssl/certificates/expired_cert.pem',
-      '../net/data/ssl/certificates/test_mail_google_com.pem',
-      '../net/data/ssl/certificates/unittest.originbound.der',
-      '../net/data/ssl/certificates/unittest.originbound.key.der',
-      '../net/tools/testserver/asn1.py',
-      '../net/tools/testserver/echo_message.py',
-      '../net/tools/testserver/minica.py',
-      '../net/tools/testserver/testserver.py',
-      '../net/tools/testserver/testserver_base.py',
-      '../testing/test_env.py',
-      '../third_party/pyftpdlib/src/pyftpdlib/__init__.py',
-      '../third_party/pyftpdlib/src/pyftpdlib/ftpserver.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/__init__.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/_stream_base.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/_stream_hixie75.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/_stream_hybi.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/common.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/dispatch.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/extensions.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/http_header_util.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/memorizingfile.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/msgutil.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/mux.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/standalone.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/stream.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/util.py',
-      '../third_party/tlslite/tlslite/BaseDB.py',
-      '../third_party/tlslite/tlslite/Checker.py',
-      '../third_party/tlslite/tlslite/FileObject.py',
-      '../third_party/tlslite/tlslite/HandshakeSettings.py',
-      '../third_party/tlslite/tlslite/Session.py',
-      '../third_party/tlslite/tlslite/SessionCache.py',
-      '../third_party/tlslite/tlslite/SharedKeyDB.py',
-      '../third_party/tlslite/tlslite/TLSConnection.py',
-      '../third_party/tlslite/tlslite/TLSRecordLayer.py',
-      '../third_party/tlslite/tlslite/VerifierDB.py',
-      '../third_party/tlslite/tlslite/X509.py',
-      '../third_party/tlslite/tlslite/X509CertChain.py',
-      '../third_party/tlslite/tlslite/__init__.py',
-      '../third_party/tlslite/tlslite/api.py',
-      '../third_party/tlslite/tlslite/constants.py',
-      '../third_party/tlslite/tlslite/errors.py',
-      '../third_party/tlslite/tlslite/integration/AsyncStateMachine.py',
-      '../third_party/tlslite/tlslite/integration/ClientHelper.py',
-      '../third_party/tlslite/tlslite/integration/HTTPTLSConnection.py',
-      '../third_party/tlslite/tlslite/integration/IMAP4_TLS.py',
-      '../third_party/tlslite/tlslite/integration/POP3_TLS.py',
-      '../third_party/tlslite/tlslite/integration/SMTP_TLS.py',
-      '../third_party/tlslite/tlslite/integration/TLSAsyncDispatcherMixIn.py',
-      '../third_party/tlslite/tlslite/integration/TLSSocketServerMixIn.py',
-      '../third_party/tlslite/tlslite/integration/XMLRPCTransport.py',
-      '../third_party/tlslite/tlslite/integration/__init__.py',
-      '../third_party/tlslite/tlslite/mathtls.py',
-      '../third_party/tlslite/tlslite/messages.py',
-      '../third_party/tlslite/tlslite/utils/AES.py',
-      '../third_party/tlslite/tlslite/utils/ASN1Parser.py',
-      '../third_party/tlslite/tlslite/utils/Python_AES.py',
-      '../third_party/tlslite/tlslite/utils/Python_RC4.py',
-      '../third_party/tlslite/tlslite/utils/Python_RSAKey.py',
-      '../third_party/tlslite/tlslite/utils/RC4.py',
-      '../third_party/tlslite/tlslite/utils/RSAKey.py',
-      '../third_party/tlslite/tlslite/utils/__init__.py',
-      '../third_party/tlslite/tlslite/utils/cipherfactory.py',
-      '../third_party/tlslite/tlslite/utils/codec.py',
-      '../third_party/tlslite/tlslite/utils/compat.py',
-      '../third_party/tlslite/tlslite/utils/cryptomath.py',
-      '../third_party/tlslite/tlslite/utils/hmac.py',
-      '../third_party/tlslite/tlslite/utils/keyfactory.py',
-      '../third_party/tlslite/tlslite/utils/rijndael.py',
-      '../third_party/tlslite/tlslite/utils/xmltools.py',
-      '../tools/swarm_client/run_isolated.py',
-      '../tools/swarm_client/run_test_cases.py',
       '<(PRODUCT_DIR)/resources.pak',
       '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
-      'third_party/mock4js/mock4js.js',
     ],
     'isolate_dependency_untracked': [
+      '../base/prefs/test/data/',
+      '../net/data/',
+      '../net/tools/testserver/',
+      '../testing/test_env.py',
       '../third_party/hunspell_dictionaries/',
-      '../third_party/pywebsocket/src/mod_pywebsocket/handshake/',
+      '../third_party/pyftpdlib/',
+      '../third_party/pywebsocket/',
+      '../third_party/tlslite/',
+      '../tools/swarm_client/',
+      'third_party/mock4js/',
       'test/data/',
+      '<(PRODUCT_DIR)/pyproto/',
     ],
   },
   'conditions': [
@@ -101,19 +32,10 @@
           '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
-          '../net/data/ssl/certificates/google.single.der',
-          '../net/data/ssl/certificates/ndn.ca.crt',
-          '../net/data/ssl/certificates/root_ca_cert.crt',
           '../testing/xvfb.py',
-          '../third_party/tlslite/tlslite/utils/PyCrypto_AES.py',
-          '../third_party/tlslite/tlslite/utils/PyCrypto_RC4.py',
-          '../third_party/tlslite/tlslite/utils/PyCrypto_RSAKey.py',
-          '../third_party/tlslite/tlslite/utils/PyCrypto_TripleDES.py',
-          '../third_party/tlslite/tlslite/utils/TripleDES.py',
           '<(PRODUCT_DIR)/chrome.pak',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/locales/fr.pak',
-          '<(PRODUCT_DIR)/pyproto/google/__init__.py',
           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
@@ -159,151 +81,18 @@
     ['OS=="win"', {
       'variables': {
         'isolate_dependency_tracked': [
-          '../third_party/python_26/DLLs/_hashlib.pyd',
-          '../third_party/python_26/DLLs/_socket.pyd',
-          '../third_party/python_26/DLLs/_ssl.pyd',
-          '../third_party/python_26/DLLs/pyexpat.pyd',
-          '../third_party/python_26/DLLs/select.pyd',
-          '../third_party/python_26/Lib/BaseHTTPServer.py',
-          '../third_party/python_26/Lib/CGIHTTPServer.py',
-          '../third_party/python_26/Lib/ConfigParser.py',
-          '../third_party/python_26/Lib/Queue.py',
-          '../third_party/python_26/Lib/SimpleHTTPServer.py',
-          '../third_party/python_26/Lib/SocketServer.py',
-          '../third_party/python_26/Lib/StringIO.py',
-          '../third_party/python_26/Lib/UserDict.py',
-          '../third_party/python_26/Lib/__future__.py',
-          '../third_party/python_26/Lib/_abcoll.py',
-          '../third_party/python_26/Lib/abc.py',
-          '../third_party/python_26/Lib/anydbm.py',
-          '../third_party/python_26/Lib/asynchat.py',
-          '../third_party/python_26/Lib/asyncore.py',
-          '../third_party/python_26/Lib/atexit.py',
-          '../third_party/python_26/Lib/base64.py',
-          '../third_party/python_26/Lib/bisect.py',
-          '../third_party/python_26/Lib/cgi.py',
-          '../third_party/python_26/Lib/codecs.py',
-          '../third_party/python_26/Lib/collections.py',
-          '../third_party/python_26/Lib/copy.py',
-          '../third_party/python_26/Lib/copy_reg.py',
-          '../third_party/python_26/Lib/dbhash.py',
-          '../third_party/python_26/Lib/dumbdbm.py',
-          '../third_party/python_26/Lib/email/__init__.py',
-          '../third_party/python_26/Lib/email/_parseaddr.py',
-          '../third_party/python_26/Lib/email/base64mime.py',
-          '../third_party/python_26/Lib/email/charset.py',
-          '../third_party/python_26/Lib/email/encoders.py',
-          '../third_party/python_26/Lib/email/errors.py',
-          '../third_party/python_26/Lib/email/feedparser.py',
-          '../third_party/python_26/Lib/email/iterators.py',
-          '../third_party/python_26/Lib/email/message.py',
-          '../third_party/python_26/Lib/email/mime/__init__.py',
-          '../third_party/python_26/Lib/email/parser.py',
-          '../third_party/python_26/Lib/email/quoprimime.py',
-          '../third_party/python_26/Lib/email/utils.py',
-          '../third_party/python_26/Lib/encodings/__init__.py',
-          '../third_party/python_26/Lib/encodings/aliases.py',
-          '../third_party/python_26/Lib/encodings/cp1252.py',
-          '../third_party/python_26/Lib/encodings/hex_codec.py',
-          '../third_party/python_26/Lib/fnmatch.py',
-          '../third_party/python_26/Lib/functools.py',
-          '../third_party/python_26/Lib/genericpath.py',
-          '../third_party/python_26/Lib/gettext.py',
-          '../third_party/python_26/Lib/glob.py',
-          '../third_party/python_26/Lib/hashlib.py',
-          '../third_party/python_26/Lib/heapq.py',
-          '../third_party/python_26/Lib/hmac.py',
-          '../third_party/python_26/Lib/httplib.py',
-          '../third_party/python_26/Lib/imaplib.py',
-          '../third_party/python_26/Lib/json/__init__.py',
-          '../third_party/python_26/Lib/json/decoder.py',
-          '../third_party/python_26/Lib/json/encoder.py',
-          '../third_party/python_26/Lib/json/scanner.py',
-          '../third_party/python_26/Lib/keyword.py',
-          '../third_party/python_26/Lib/linecache.py',
-          '../third_party/python_26/Lib/locale.py',
-          '../third_party/python_26/Lib/logging/__init__.py',
-          '../third_party/python_26/Lib/logging/handlers.py',
-          '../third_party/python_26/Lib/md5.py',
-          '../third_party/python_26/Lib/mimetools.py',
-          '../third_party/python_26/Lib/mimetypes.py',
-          '../third_party/python_26/Lib/ntpath.py',
-          '../third_party/python_26/Lib/nturl2path.py',
-          '../third_party/python_26/Lib/optparse.py',
-          '../third_party/python_26/Lib/os.py',
-          '../third_party/python_26/Lib/poplib.py',
-          '../third_party/python_26/Lib/posixpath.py',
-          '../third_party/python_26/Lib/quopri.py',
-          '../third_party/python_26/Lib/random.py',
-          '../third_party/python_26/Lib/re.py',
-          '../third_party/python_26/Lib/rfc822.py',
-          '../third_party/python_26/Lib/sha.py',
-          '../third_party/python_26/Lib/shutil.py',
-          '../third_party/python_26/Lib/site-packages/google.pth',
-          '../third_party/python_26/Lib/site-packages/pywin32.pth',
-          '../third_party/python_26/Lib/site.py',
-          '../third_party/python_26/Lib/smtplib.py',
-          '../third_party/python_26/Lib/socket.py',
-          '../third_party/python_26/Lib/sre_compile.py',
-          '../third_party/python_26/Lib/sre_constants.py',
-          '../third_party/python_26/Lib/sre_parse.py',
-          '../third_party/python_26/Lib/ssl.py',
-          '../third_party/python_26/Lib/stat.py',
-          '../third_party/python_26/Lib/string.py',
-          '../third_party/python_26/Lib/struct.py',
-          '../third_party/python_26/Lib/tarfile.py',
-          '../third_party/python_26/Lib/tempfile.py',
-          '../third_party/python_26/Lib/textwrap.py',
-          '../third_party/python_26/Lib/threading.py',
-          '../third_party/python_26/Lib/traceback.py',
-          '../third_party/python_26/Lib/types.py',
-          '../third_party/python_26/Lib/urllib.py',
-          '../third_party/python_26/Lib/urlparse.py',
-          '../third_party/python_26/Lib/uu.py',
-          '../third_party/python_26/Lib/warnings.py',
-          '../third_party/python_26/Lib/xml/__init__.py',
-          '../third_party/python_26/Lib/xml/dom/NodeFilter.py',
-          '../third_party/python_26/Lib/xml/dom/__init__.py',
-          '../third_party/python_26/Lib/xml/dom/domreg.py',
-          '../third_party/python_26/Lib/xml/dom/minicompat.py',
-          '../third_party/python_26/Lib/xml/dom/minidom.py',
-          '../third_party/python_26/Lib/xml/dom/xmlbuilder.py',
-          '../third_party/python_26/Lib/xml/sax/__init__.py',
-          '../third_party/python_26/Lib/xml/sax/_exceptions.py',
-          '../third_party/python_26/Lib/xml/sax/handler.py',
-          '../third_party/python_26/Lib/xml/sax/saxutils.py',
-          '../third_party/python_26/Lib/xml/sax/xmlreader.py',
-          '../third_party/python_26/Lib/xmlrpclib.py',
-          '../third_party/python_26/python.exe',
-          '../third_party/python_26/python26.dll',
           '<(PRODUCT_DIR)/ffmpegsumo.dll',
           '<(PRODUCT_DIR)/gyp-win-tool',
           '<(PRODUCT_DIR)/icudt.dll',
         ],
         'isolate_dependency_untracked': [
           '../ppapi/lib/gl/include/KHR/',
-          '../skia/ext/data/vectorcanvastest/basicdrawing/',
-          '../skia/ext/data/vectorcanvastest/bitmaps/',
-          '../skia/ext/data/vectorcanvastest/circles/',
-          '../skia/ext/data/vectorcanvastest/clippingclean/',
-          '../skia/ext/data/vectorcanvastest/clippingcombined/',
-          '../skia/ext/data/vectorcanvastest/clippingintersect/',
-          '../skia/ext/data/vectorcanvastest/clippingpath/',
-          '../skia/ext/data/vectorcanvastest/clippingrect/',
-          '../skia/ext/data/vectorcanvastest/diagonallines/',
-          '../skia/ext/data/vectorcanvastest/lineorientation/',
-          '../skia/ext/data/vectorcanvastest/pathorientation/',
-          '../third_party/python_26/Lib/xml/parsers/',
+          '../skia/ext/data/',
+          '../third_party/python_26/',
           '../ui/base/glib/',
           '<(PRODUCT_DIR)/test_data/ui/',
         ],
       },
-    }, {
-      'variables': {
-        'isolate_dependency_tracked': [
-          '../third_party/tlslite/tlslite/integration/TLSTwistedProtocolWrapper.py',
-        ],
-      },
     }],
   ],
 }
diff --git a/net/net_unittests.isolate b/net/net_unittests.isolate
index 0fc30a2..62799cb 100644
--- a/net/net_unittests.isolate
+++ b/net/net_unittests.isolate
@@ -9,79 +9,17 @@
       '../chrome/test/data/server-unavailable.html.mock-http-headers',
       '../chrome/test/data/simple.html',
       '../testing/test_env.py',
-      '../third_party/pyftpdlib/src/pyftpdlib/__init__.py',
-      '../third_party/pyftpdlib/src/pyftpdlib/ftpserver.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/__init__.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/_stream_base.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/_stream_hixie75.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/_stream_hybi.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/common.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/dispatch.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/extensions.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/http_header_util.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/memorizingfile.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/msgutil.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/mux.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/standalone.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/stream.py',
-      '../third_party/pywebsocket/src/mod_pywebsocket/util.py',
-      '../third_party/tlslite/tlslite/BaseDB.py',
-      '../third_party/tlslite/tlslite/Checker.py',
-      '../third_party/tlslite/tlslite/FileObject.py',
-      '../third_party/tlslite/tlslite/HandshakeSettings.py',
-      '../third_party/tlslite/tlslite/Session.py',
-      '../third_party/tlslite/tlslite/SessionCache.py',
-      '../third_party/tlslite/tlslite/SharedKeyDB.py',
-      '../third_party/tlslite/tlslite/TLSConnection.py',
-      '../third_party/tlslite/tlslite/TLSRecordLayer.py',
-      '../third_party/tlslite/tlslite/VerifierDB.py',
-      '../third_party/tlslite/tlslite/X509.py',
-      '../third_party/tlslite/tlslite/X509CertChain.py',
-      '../third_party/tlslite/tlslite/__init__.py',
-      '../third_party/tlslite/tlslite/api.py',
-      '../third_party/tlslite/tlslite/constants.py',
-      '../third_party/tlslite/tlslite/errors.py',
-      '../third_party/tlslite/tlslite/integration/AsyncStateMachine.py',
-      '../third_party/tlslite/tlslite/integration/ClientHelper.py',
-      '../third_party/tlslite/tlslite/integration/HTTPTLSConnection.py',
-      '../third_party/tlslite/tlslite/integration/IMAP4_TLS.py',
-      '../third_party/tlslite/tlslite/integration/POP3_TLS.py',
-      '../third_party/tlslite/tlslite/integration/SMTP_TLS.py',
-      '../third_party/tlslite/tlslite/integration/TLSAsyncDispatcherMixIn.py',
-      '../third_party/tlslite/tlslite/integration/TLSSocketServerMixIn.py',
-      '../third_party/tlslite/tlslite/integration/XMLRPCTransport.py',
-      '../third_party/tlslite/tlslite/integration/__init__.py',
-      '../third_party/tlslite/tlslite/mathtls.py',
-      '../third_party/tlslite/tlslite/messages.py',
-      '../third_party/tlslite/tlslite/utils/AES.py',
-      '../third_party/tlslite/tlslite/utils/ASN1Parser.py',
-      '../third_party/tlslite/tlslite/utils/Python_AES.py',
-      '../third_party/tlslite/tlslite/utils/Python_RC4.py',
-      '../third_party/tlslite/tlslite/utils/Python_RSAKey.py',
-      '../third_party/tlslite/tlslite/utils/RC4.py',
-      '../third_party/tlslite/tlslite/utils/RSAKey.py',
-      '../third_party/tlslite/tlslite/utils/__init__.py',
-      '../third_party/tlslite/tlslite/utils/cipherfactory.py',
-      '../third_party/tlslite/tlslite/utils/codec.py',
-      '../third_party/tlslite/tlslite/utils/compat.py',
-      '../third_party/tlslite/tlslite/utils/cryptomath.py',
-      '../third_party/tlslite/tlslite/utils/hmac.py',
-      '../third_party/tlslite/tlslite/utils/keyfactory.py',
-      '../third_party/tlslite/tlslite/utils/rijndael.py',
-      '../third_party/tlslite/tlslite/utils/xmltools.py',
       '../tools/swarm_client/run_isolated.py',
       '../tools/swarm_client/run_test_cases.py',
       '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)',
-      'tools/testserver/asn1.py',
-      'tools/testserver/echo_message.py',
-      'tools/testserver/minica.py',
-      'tools/testserver/testserver.py',
     ],
     'isolate_dependency_untracked': [
-      '../third_party/pywebsocket/src/mod_pywebsocket/handshake/',
-      '../third_party/tlslite/tlslite/',
+      '../third_party/pywebsocket/',
+      '../third_party/tlslite/',
+      '../third_party/pyftpdlib/',
       'data/',
       'tools/testserver/',
+      '<(PRODUCT_DIR)/pyproto/',
     ],
   },
   'conditions': [
@@ -95,124 +33,7 @@
         ],
         'isolate_dependency_tracked': [
           '../testing/xvfb.py',
-          '../third_party/tlslite/tlslite/utils/PyCrypto_AES.py',
-          '../third_party/tlslite/tlslite/utils/PyCrypto_RC4.py',
-          '../third_party/tlslite/tlslite/utils/PyCrypto_RSAKey.py',
-          '../third_party/tlslite/tlslite/utils/PyCrypto_TripleDES.py',
-          '../third_party/tlslite/tlslite/utils/TripleDES.py',
-          '<(PRODUCT_DIR)/pyproto/google/__init__.py',
           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
-          'data/ftp/dir-listing-ls-1',
-          'data/ftp/dir-listing-ls-1-utf8',
-          'data/ftp/dir-listing-ls-1-utf8.expected',
-          'data/ftp/dir-listing-ls-1.expected',
-          'data/ftp/dir-listing-ls-10',
-          'data/ftp/dir-listing-ls-10.expected',
-          'data/ftp/dir-listing-ls-11',
-          'data/ftp/dir-listing-ls-11.expected',
-          'data/ftp/dir-listing-ls-12',
-          'data/ftp/dir-listing-ls-12.expected',
-          'data/ftp/dir-listing-ls-13',
-          'data/ftp/dir-listing-ls-13.expected',
-          'data/ftp/dir-listing-ls-14',
-          'data/ftp/dir-listing-ls-14.expected',
-          'data/ftp/dir-listing-ls-15',
-          'data/ftp/dir-listing-ls-15.expected',
-          'data/ftp/dir-listing-ls-16',
-          'data/ftp/dir-listing-ls-16.expected',
-          'data/ftp/dir-listing-ls-17',
-          'data/ftp/dir-listing-ls-18',
-          'data/ftp/dir-listing-ls-18.expected',
-          'data/ftp/dir-listing-ls-19',
-          'data/ftp/dir-listing-ls-19.expected',
-          'data/ftp/dir-listing-ls-2',
-          'data/ftp/dir-listing-ls-2.expected',
-          'data/ftp/dir-listing-ls-20',
-          'data/ftp/dir-listing-ls-20.expected',
-          'data/ftp/dir-listing-ls-21',
-          'data/ftp/dir-listing-ls-21.expected',
-          'data/ftp/dir-listing-ls-22',
-          'data/ftp/dir-listing-ls-22.expected',
-          'data/ftp/dir-listing-ls-23',
-          'data/ftp/dir-listing-ls-24',
-          'data/ftp/dir-listing-ls-24.expected',
-          'data/ftp/dir-listing-ls-25',
-          'data/ftp/dir-listing-ls-25.expected',
-          'data/ftp/dir-listing-ls-26',
-          'data/ftp/dir-listing-ls-26.expected',
-          'data/ftp/dir-listing-ls-27',
-          'data/ftp/dir-listing-ls-27.expected',
-          'data/ftp/dir-listing-ls-28',
-          'data/ftp/dir-listing-ls-28.expected',
-          'data/ftp/dir-listing-ls-29',
-          'data/ftp/dir-listing-ls-29.expected',
-          'data/ftp/dir-listing-ls-3',
-          'data/ftp/dir-listing-ls-3.expected',
-          'data/ftp/dir-listing-ls-4',
-          'data/ftp/dir-listing-ls-4.expected',
-          'data/ftp/dir-listing-ls-5',
-          'data/ftp/dir-listing-ls-5.expected',
-          'data/ftp/dir-listing-ls-6',
-          'data/ftp/dir-listing-ls-6.expected',
-          'data/ftp/dir-listing-ls-7',
-          'data/ftp/dir-listing-ls-7.expected',
-          'data/ftp/dir-listing-ls-8',
-          'data/ftp/dir-listing-ls-9',
-          'data/ftp/dir-listing-ls-9.expected',
-          'data/ftp/dir-listing-netware-1',
-          'data/ftp/dir-listing-netware-1.expected',
-          'data/ftp/dir-listing-netware-2',
-          'data/ftp/dir-listing-netware-2.expected',
-          'data/ftp/dir-listing-os2-1',
-          'data/ftp/dir-listing-os2-1.expected',
-          'data/ftp/dir-listing-vms-1',
-          'data/ftp/dir-listing-vms-1.expected',
-          'data/ftp/dir-listing-vms-2',
-          'data/ftp/dir-listing-vms-2.expected',
-          'data/ftp/dir-listing-vms-3',
-          'data/ftp/dir-listing-vms-4',
-          'data/ftp/dir-listing-vms-4.expected',
-          'data/ftp/dir-listing-vms-5',
-          'data/ftp/dir-listing-vms-5.expected',
-          'data/ftp/dir-listing-windows-1',
-          'data/ftp/dir-listing-windows-1.expected',
-          'data/ftp/dir-listing-windows-2',
-          'data/ftp/dir-listing-windows-2.expected',
-          'data/ssl/certificates/certse.pem',
-          'data/ssl/certificates/client-nokey.p12',
-          'data/ssl/certificates/client.p12',
-          'data/ssl/certificates/dod_ca_13_cert.der',
-          'data/ssl/certificates/punycodetest.der',
-          'data/ssl/certificates/spdy_pooling.pem',
-        ],
-        'isolate_dependency_touched': [
-          'data/ftp/dir-listing-ls-17.expected',
-          'data/ftp/dir-listing-ls-23.expected',
-          'data/ftp/dir-listing-ls-8.expected',
-          'data/ftp/dir-listing-vms-3.expected',
-          'data/proxy_script_fetcher_unittest/large-pac.nsproxy',
-          'data/proxy_script_fetcher_unittest/pac.txt',
-          'data/url_request_unittest/BullRunSpeech.txt',
-          'data/url_request_unittest/content-type-normalization.html',
-          'data/url_request_unittest/content-type-normalization.html.mock-http-headers',
-          'data/url_request_unittest/redirect-test.html',
-          'data/url_request_unittest/redirect-test.html.mock-http-headers',
-          'data/url_request_unittest/redirect-to-echoall',
-          'data/url_request_unittest/redirect-to-echoall.mock-http-headers',
-          'data/url_request_unittest/redirect-to-file.html',
-          'data/url_request_unittest/redirect-to-file.html.mock-http-headers',
-          'data/url_request_unittest/redirect-to-invalid-url.html',
-          'data/url_request_unittest/redirect-to-invalid-url.html.mock-http-headers',
-          'data/url_request_unittest/redirect301-to-echo',
-          'data/url_request_unittest/redirect301-to-echo.mock-http-headers',
-          'data/url_request_unittest/redirect302-to-echo',
-          'data/url_request_unittest/redirect302-to-echo.mock-http-headers',
-          'data/url_request_unittest/redirect303-to-echo',
-          'data/url_request_unittest/redirect303-to-echo.mock-http-headers',
-          'data/url_request_unittest/redirect307-to-echo',
-          'data/url_request_unittest/redirect307-to-echo.mock-http-headers',
-          'data/url_request_unittest/with-headers.html',
-          'data/url_request_unittest/with-headers.html.mock-http-headers',
         ],
       },
     }, {
@@ -224,297 +45,13 @@
         ],
       },
     }],
-    ['OS=="mac"', {
-    }, {
-      'variables': {
-        'isolate_dependency_tracked': [
-          'data/proxy_resolver_v8_tracing_unittest/dns.js',
-          'data/proxy_resolver_v8_tracing_unittest/dns_during_init.js',
-          'data/proxy_resolver_v8_tracing_unittest/error.js',
-          'data/proxy_resolver_v8_tracing_unittest/global_sideffects1.js',
-          'data/proxy_resolver_v8_tracing_unittest/global_sideffects2.js',
-          'data/proxy_resolver_v8_tracing_unittest/global_sideffects3.js',
-          'data/proxy_resolver_v8_tracing_unittest/global_sideffects4.js',
-          'data/proxy_resolver_v8_tracing_unittest/simple.js',
-          'data/proxy_resolver_v8_tracing_unittest/simple_dns.js',
-          'data/proxy_resolver_v8_tracing_unittest/too_many_alerts.js',
-          'data/proxy_resolver_v8_tracing_unittest/too_many_empty_alerts.js',
-          'data/proxy_resolver_v8_unittest/binding_from_global.js',
-          'data/proxy_resolver_v8_unittest/bindings.js',
-          'data/proxy_resolver_v8_unittest/direct.js',
-          'data/proxy_resolver_v8_unittest/dns_fail.js',
-          'data/proxy_resolver_v8_unittest/ends_with_comment.js',
-          'data/proxy_resolver_v8_unittest/ends_with_statement_no_semicolon.js',
-          'data/proxy_resolver_v8_unittest/international_domain_names.js',
-          'data/proxy_resolver_v8_unittest/missing_close_brace.js',
-          'data/proxy_resolver_v8_unittest/no_entrypoint.js',
-          'data/proxy_resolver_v8_unittest/pac_library_unittest.js',
-          'data/proxy_resolver_v8_unittest/passthrough.js',
-          'data/proxy_resolver_v8_unittest/resolve_host.js',
-          'data/proxy_resolver_v8_unittest/return_empty_string.js',
-          'data/proxy_resolver_v8_unittest/return_function.js',
-          'data/proxy_resolver_v8_unittest/return_integer.js',
-          'data/proxy_resolver_v8_unittest/return_null.js',
-          'data/proxy_resolver_v8_unittest/return_object.js',
-          'data/proxy_resolver_v8_unittest/return_undefined.js',
-          'data/proxy_resolver_v8_unittest/return_unicode.js',
-          'data/proxy_resolver_v8_unittest/side_effects.js',
-          'data/proxy_resolver_v8_unittest/unhandled_exception.js',
-          'data/ssl/certificates/1024-rsa-ee-by-1024-rsa-intermediate.pem',
-          'data/ssl/certificates/1024-rsa-ee-by-2048-rsa-intermediate.pem',
-          'data/ssl/certificates/1024-rsa-ee-by-768-rsa-intermediate.pem',
-          'data/ssl/certificates/1024-rsa-ee-by-prime256v1-ecdsa-intermediate.pem',
-          'data/ssl/certificates/1024-rsa-intermediate.pem',
-          'data/ssl/certificates/2048-rsa-ee-by-1024-rsa-intermediate.pem',
-          'data/ssl/certificates/2048-rsa-ee-by-2048-rsa-intermediate.pem',
-          'data/ssl/certificates/2048-rsa-ee-by-768-rsa-intermediate.pem',
-          'data/ssl/certificates/2048-rsa-ee-by-prime256v1-ecdsa-intermediate.pem',
-          'data/ssl/certificates/2048-rsa-intermediate.pem',
-          'data/ssl/certificates/2048-rsa-root.pem',
-          'data/ssl/certificates/768-rsa-ee-by-1024-rsa-intermediate.pem',
-          'data/ssl/certificates/768-rsa-ee-by-2048-rsa-intermediate.pem',
-          'data/ssl/certificates/768-rsa-ee-by-768-rsa-intermediate.pem',
-          'data/ssl/certificates/768-rsa-ee-by-prime256v1-ecdsa-intermediate.pem',
-          'data/ssl/certificates/768-rsa-intermediate.pem',
-          'data/ssl/certificates/comodo.chain.pem',
-          'data/ssl/certificates/diginotar_cyber_ca.pem',
-          'data/ssl/certificates/diginotar_pkioverheid.pem',
-          'data/ssl/certificates/diginotar_pkioverheid_g2.pem',
-          'data/ssl/certificates/diginotar_public_ca_2025.pem',
-          'data/ssl/certificates/diginotar_root_ca.pem',
-          'data/ssl/certificates/diginotar_services_1024_ca.pem',
-          'data/ssl/certificates/dod_ca_17_cert.der',
-          'data/ssl/certificates/dod_root_ca_2_cert.der',
-          'data/ssl/certificates/expired_cert.pem',
-          'data/ssl/certificates/globalsign_orgv1_ca.pem',
-          'data/ssl/certificates/globalsign_root_ca_md5.pem',
-          'data/ssl/certificates/google.binary.p7b',
-          'data/ssl/certificates/google.chain.pem',
-          'data/ssl/certificates/google.pem_cert.p7b',
-          'data/ssl/certificates/google.pem_pkcs7.p7b',
-          'data/ssl/certificates/google.single.der',
-          'data/ssl/certificates/google.single.pem',
-          'data/ssl/certificates/google_diginotar.pem',
-          'data/ssl/certificates/googlenew.chain.pem',
-          'data/ssl/certificates/images_etrade_wallst_com.pem',
-          'data/ssl/certificates/invalid_key_usage_cert.der',
-          'data/ssl/certificates/multivalue_rdn.pem',
-          'data/ssl/certificates/nist.der',
-          'data/ssl/certificates/ocsp-test-root.pem',
-          'data/ssl/certificates/ok_cert.pem',
-          'data/ssl/certificates/prime256v1-ecdsa-ee-by-1024-rsa-intermediate.pem',
-          'data/ssl/certificates/prime256v1-ecdsa-ee-by-2048-rsa-intermediate.pem',
-          'data/ssl/certificates/prime256v1-ecdsa-ee-by-768-rsa-intermediate.pem',
-          'data/ssl/certificates/prime256v1-ecdsa-ee-by-prime256v1-ecdsa-intermediate.pem',
-          'data/ssl/certificates/prime256v1-ecdsa-intermediate.pem',
-          'data/ssl/certificates/redundant-server-chain.pem',
-          'data/ssl/certificates/redundant-validated-chain-root.pem',
-          'data/ssl/certificates/redundant-validated-chain.pem',
-          'data/ssl/certificates/root_ca_cert.crt',
-          'data/ssl/certificates/salesforce_com_test.pem',
-          'data/ssl/certificates/subjectAltName_sanity_check.pem',
-          'data/ssl/certificates/test_mail_google_com.pem',
-          'data/ssl/certificates/unescaped.pem',
-          'data/ssl/certificates/unittest.key.bin',
-          'data/ssl/certificates/unittest.selfsigned.der',
-          'data/ssl/certificates/verisign_intermediate_ca_2011.pem',
-          'data/ssl/certificates/verisign_intermediate_ca_2016.pem',
-          'data/ssl/certificates/weak_digest_md2_root.pem',
-          'data/ssl/certificates/weak_digest_md5_intermediate.pem',
-          'data/ssl/certificates/weak_digest_md5_root.pem',
-          'data/ssl/certificates/weak_digest_sha1_ee.pem',
-          'data/ssl/certificates/weak_digest_sha1_intermediate.pem',
-          'data/ssl/certificates/weak_digest_sha1_root.pem',
-          'data/ssl/certificates/www_us_army_mil_cert.der',
-          'data/ssl/certificates/x509_verify_results.chain.pem',
-        ],
-        'isolate_dependency_untracked': [
-          'data/cache_tests/',
-          'data/filter_unittests/',
-          'data/ftp/',
-          'data/proxy_script_fetcher_unittest/',
-          'data/url_request_unittest/',
-        ],
-      },
-    }],
     ['OS=="win"', {
       'variables': {
         'isolate_dependency_tracked': [
-          '../third_party/python_26/DLLs/_hashlib.pyd',
-          '../third_party/python_26/DLLs/_socket.pyd',
-          '../third_party/python_26/DLLs/_ssl.pyd',
-          '../third_party/python_26/DLLs/pyexpat.pyd',
-          '../third_party/python_26/DLLs/select.pyd',
-          '../third_party/python_26/Lib/BaseHTTPServer.py',
-          '../third_party/python_26/Lib/CGIHTTPServer.py',
-          '../third_party/python_26/Lib/ConfigParser.py',
-          '../third_party/python_26/Lib/Queue.py',
-          '../third_party/python_26/Lib/SimpleHTTPServer.py',
-          '../third_party/python_26/Lib/SocketServer.py',
-          '../third_party/python_26/Lib/StringIO.py',
-          '../third_party/python_26/Lib/UserDict.py',
-          '../third_party/python_26/Lib/__future__.py',
-          '../third_party/python_26/Lib/_abcoll.py',
-          '../third_party/python_26/Lib/abc.py',
-          '../third_party/python_26/Lib/anydbm.py',
-          '../third_party/python_26/Lib/asynchat.py',
-          '../third_party/python_26/Lib/asyncore.py',
-          '../third_party/python_26/Lib/atexit.py',
-          '../third_party/python_26/Lib/base64.py',
-          '../third_party/python_26/Lib/bisect.py',
-          '../third_party/python_26/Lib/cgi.py',
-          '../third_party/python_26/Lib/codecs.py',
-          '../third_party/python_26/Lib/collections.py',
-          '../third_party/python_26/Lib/copy.py',
-          '../third_party/python_26/Lib/copy_reg.py',
-          '../third_party/python_26/Lib/dbhash.py',
-          '../third_party/python_26/Lib/dumbdbm.py',
-          '../third_party/python_26/Lib/email/__init__.py',
-          '../third_party/python_26/Lib/email/_parseaddr.py',
-          '../third_party/python_26/Lib/email/base64mime.py',
-          '../third_party/python_26/Lib/email/charset.py',
-          '../third_party/python_26/Lib/email/encoders.py',
-          '../third_party/python_26/Lib/email/errors.py',
-          '../third_party/python_26/Lib/email/feedparser.py',
-          '../third_party/python_26/Lib/email/iterators.py',
-          '../third_party/python_26/Lib/email/message.py',
-          '../third_party/python_26/Lib/email/mime/__init__.py',
-          '../third_party/python_26/Lib/email/parser.py',
-          '../third_party/python_26/Lib/email/quoprimime.py',
-          '../third_party/python_26/Lib/email/utils.py',
-          '../third_party/python_26/Lib/encodings/__init__.py',
-          '../third_party/python_26/Lib/encodings/aliases.py',
-          '../third_party/python_26/Lib/encodings/base64_codec.py',
-          '../third_party/python_26/Lib/encodings/cp1252.py',
-          '../third_party/python_26/Lib/encodings/hex_codec.py',
-          '../third_party/python_26/Lib/fnmatch.py',
-          '../third_party/python_26/Lib/functools.py',
-          '../third_party/python_26/Lib/genericpath.py',
-          '../third_party/python_26/Lib/gettext.py',
-          '../third_party/python_26/Lib/glob.py',
-          '../third_party/python_26/Lib/hashlib.py',
-          '../third_party/python_26/Lib/heapq.py',
-          '../third_party/python_26/Lib/hmac.py',
-          '../third_party/python_26/Lib/httplib.py',
-          '../third_party/python_26/Lib/imaplib.py',
-          '../third_party/python_26/Lib/json/__init__.py',
-          '../third_party/python_26/Lib/json/decoder.py',
-          '../third_party/python_26/Lib/json/encoder.py',
-          '../third_party/python_26/Lib/json/scanner.py',
-          '../third_party/python_26/Lib/keyword.py',
-          '../third_party/python_26/Lib/linecache.py',
-          '../third_party/python_26/Lib/locale.py',
-          '../third_party/python_26/Lib/logging/__init__.py',
-          '../third_party/python_26/Lib/logging/handlers.py',
-          '../third_party/python_26/Lib/md5.py',
-          '../third_party/python_26/Lib/mimetools.py',
-          '../third_party/python_26/Lib/mimetypes.py',
-          '../third_party/python_26/Lib/ntpath.py',
-          '../third_party/python_26/Lib/nturl2path.py',
-          '../third_party/python_26/Lib/optparse.py',
-          '../third_party/python_26/Lib/os.py',
-          '../third_party/python_26/Lib/poplib.py',
-          '../third_party/python_26/Lib/posixpath.py',
-          '../third_party/python_26/Lib/quopri.py',
-          '../third_party/python_26/Lib/random.py',
-          '../third_party/python_26/Lib/re.py',
-          '../third_party/python_26/Lib/rfc822.py',
-          '../third_party/python_26/Lib/sha.py',
-          '../third_party/python_26/Lib/shutil.py',
-          '../third_party/python_26/Lib/site-packages/google.pth',
-          '../third_party/python_26/Lib/site-packages/pywin32.pth',
-          '../third_party/python_26/Lib/site.py',
-          '../third_party/python_26/Lib/smtplib.py',
-          '../third_party/python_26/Lib/socket.py',
-          '../third_party/python_26/Lib/sre_compile.py',
-          '../third_party/python_26/Lib/sre_constants.py',
-          '../third_party/python_26/Lib/sre_parse.py',
-          '../third_party/python_26/Lib/ssl.py',
-          '../third_party/python_26/Lib/stat.py',
-          '../third_party/python_26/Lib/string.py',
-          '../third_party/python_26/Lib/struct.py',
-          '../third_party/python_26/Lib/tarfile.py',
-          '../third_party/python_26/Lib/tempfile.py',
-          '../third_party/python_26/Lib/textwrap.py',
-          '../third_party/python_26/Lib/threading.py',
-          '../third_party/python_26/Lib/traceback.py',
-          '../third_party/python_26/Lib/types.py',
-          '../third_party/python_26/Lib/urllib.py',
-          '../third_party/python_26/Lib/urlparse.py',
-          '../third_party/python_26/Lib/uu.py',
-          '../third_party/python_26/Lib/warnings.py',
-          '../third_party/python_26/Lib/xml/__init__.py',
-          '../third_party/python_26/Lib/xml/dom/NodeFilter.py',
-          '../third_party/python_26/Lib/xml/dom/__init__.py',
-          '../third_party/python_26/Lib/xml/dom/domreg.py',
-          '../third_party/python_26/Lib/xml/dom/minicompat.py',
-          '../third_party/python_26/Lib/xml/dom/minidom.py',
-          '../third_party/python_26/Lib/xml/dom/xmlbuilder.py',
-          '../third_party/python_26/Lib/xml/sax/__init__.py',
-          '../third_party/python_26/Lib/xml/sax/_exceptions.py',
-          '../third_party/python_26/Lib/xml/sax/handler.py',
-          '../third_party/python_26/Lib/xml/sax/saxutils.py',
-          '../third_party/python_26/Lib/xml/sax/xmlreader.py',
-          '../third_party/python_26/Lib/xmlrpclib.py',
-          '../third_party/python_26/python.exe',
-          '../third_party/python_26/python26.dll',
-          '<(PRODUCT_DIR)/icudt.dll',
-          'data/proxy_script_fetcher_unittest/404.pac',
-          'data/proxy_script_fetcher_unittest/404.pac.mock-http-headers',
-          'data/proxy_script_fetcher_unittest/500.pac',
-          'data/proxy_script_fetcher_unittest/500.pac.mock-http-headers',
-          'data/proxy_script_fetcher_unittest/cacheable_1hr.pac',
-          'data/proxy_script_fetcher_unittest/cacheable_1hr.pac.mock-http-headers',
-          'data/proxy_script_fetcher_unittest/downloadable.pac',
-          'data/proxy_script_fetcher_unittest/downloadable.pac.mock-http-headers',
-          'data/proxy_script_fetcher_unittest/gzipped_pac',
-          'data/proxy_script_fetcher_unittest/gzipped_pac.mock-http-headers',
-          'data/proxy_script_fetcher_unittest/large-pac.nsproxy',
-          'data/proxy_script_fetcher_unittest/large-pac.nsproxy.mock-http-headers',
-          'data/proxy_script_fetcher_unittest/pac.html',
-          'data/proxy_script_fetcher_unittest/pac.html.mock-http-headers',
-          'data/proxy_script_fetcher_unittest/pac.nsproxy',
-          'data/proxy_script_fetcher_unittest/pac.nsproxy.mock-http-headers',
-          'data/proxy_script_fetcher_unittest/pac.txt',
-          'data/proxy_script_fetcher_unittest/pac.txt.mock-http-headers',
-          'data/proxy_script_fetcher_unittest/utf16be_pac',
-          'data/proxy_script_fetcher_unittest/utf16be_pac.mock-http-headers',
-          'data/ssl/certificates/weak_digest_md2_ee.pem',
-          'data/ssl/certificates/weak_digest_md2_intermediate.pem',
-          'data/ssl/certificates/weak_digest_md4_ee.pem',
-          'data/ssl/certificates/weak_digest_md4_intermediate.pem',
-          'data/ssl/certificates/weak_digest_md4_root.pem',
-          'data/ssl/certificates/weak_digest_md5_ee.pem',
-          'data/url_request_unittest/BullRunSpeech.txt',
-          'data/url_request_unittest/content-type-normalization.html',
-          'data/url_request_unittest/content-type-normalization.html.mock-http-headers',
-          'data/url_request_unittest/redirect-test.html',
-          'data/url_request_unittest/redirect-test.html.mock-http-headers',
-          'data/url_request_unittest/redirect-to-echoall',
-          'data/url_request_unittest/redirect-to-echoall.mock-http-headers',
-          'data/url_request_unittest/redirect-to-file.html',
-          'data/url_request_unittest/redirect-to-file.html.mock-http-headers',
-          'data/url_request_unittest/redirect-to-invalid-url.html',
-          'data/url_request_unittest/redirect-to-invalid-url.html.mock-http-headers',
-          'data/url_request_unittest/redirect301-to-echo',
-          'data/url_request_unittest/redirect301-to-echo.mock-http-headers',
-          'data/url_request_unittest/redirect302-to-echo',
-          'data/url_request_unittest/redirect302-to-echo.mock-http-headers',
-          'data/url_request_unittest/redirect303-to-echo',
-          'data/url_request_unittest/redirect303-to-echo.mock-http-headers',
-          'data/url_request_unittest/redirect307-to-echo',
-          'data/url_request_unittest/redirect307-to-echo.mock-http-headers',
-          'data/url_request_unittest/with-headers.html',
-          'data/url_request_unittest/with-headers.html.mock-http-headers',
+         '<(PRODUCT_DIR)/icudt.dll',
         ],
         'isolate_dependency_untracked': [
-          '../third_party/python_26/Lib/xml/parsers/',
-        ],
-      },
-    }, {
-      'variables': {
-        'isolate_dependency_tracked': [
-          '../third_party/tlslite/tlslite/integration/TLSTwistedProtocolWrapper.py',
+        '../third_party/python_26/',
         ],
       },
     }],