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

1 files changed, 21 insertions, 133 deletions

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/',
         ],
       },