diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
index 184074a..b5553917 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',
-        ],
-      },
     }],
   ],
 }