Update net_unittests.isolate, unit_tests.isolate and browser_tests.isolate.

Only ran one two test case per unit test per OS, since it is just to get the new
general dependencies for these tests. This was also a try to make sure the new
merging algorithm works fine.

net_unittests.isolate layout has changed since it is the first time it is
autogenerated.

This CL was completely autogenerated by running these commands on Windows, OSX and linux:
---
python shard.py -i 0 -s 2000 isolate.py trace -r ../../out/Release/browser_tests.results
python isolate.py merge -r ../../out/Release/browser_tests.results

python shard.py -i 0 -s 2000 isolate.py trace -r ../../out/Release/unit_tests.results
python isolate.py merge -r ../../out/Release/unit_tests.results

python shard.py -i 0 -s 2000 isolate.py trace -r ../../out/Release/net_unittests.results
python isolate.py merge -r ../../out/Release/net_unittests.results
---

Note that the command run is now exactly the same, independent of the OS, for
maximum copy-paste pleasure.

TBR=thakis@chromium.org
NOTRY=true
BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10689118

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

3 files changed, 30 insertions, 14 deletions

diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
index 980ae3f..c2068a9 100644
--- a/chrome/browser_tests.isolate
+++ b/chrome/browser_tests.isolate
@@ -7,7 +7,13 @@
       '../testing/test_env.py',
       '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
       '<(PRODUCT_DIR)/resources.pak',
+      '<(PRODUCT_DIR)/test_data/chrome/test/data/webui/async_gen.js',
       'test/data/extensions/api_test/tabs/basics/manifest.json',
+      'test/data/webui/test_api.js',
+      'third_party/mock4js/mock4js.js',
+    ],
+    'isolate_dependency_untracked': [
+      'test/data/extensions/api_test/accessibility/',
     ],
   },
   'conditions': [
@@ -99,7 +105,6 @@
           '<(PRODUCT_DIR)/pyproto/google/protobuf/text_format.py',
           '<(PRODUCT_DIR)/test_case.html',
           '<(PRODUCT_DIR)/test_case.html.mock-http-headers',
-          '<(PRODUCT_DIR)/test_data/chrome/test/data/webui/net_internals/net_internals_test.js',
           '<(PRODUCT_DIR)/test_data/chrome/test/data/webui/net_internals/timeline_view.js',
           '<(PRODUCT_DIR)/test_data/chrome/test/data/webui/ntp4.js',
           '<(PRODUCT_DIR)/test_page.css',
@@ -1137,6 +1142,9 @@
     }],
     ['OS=="mac"', {
       'variables': {
+        'isolate_dependency_tracked': [
+          '<(PRODUCT_DIR)/ffmpegsumo.so',
+        ],
         'isolate_dependency_untracked': [
           '<(PRODUCT_DIR)/Chromium Framework.framework/',
           '<(PRODUCT_DIR)/Chromium.app/',
@@ -1313,9 +1321,9 @@
           '../third_party/tlslite/tlslite/utils/xmltools.py',
           '<(PRODUCT_DIR)/locales/en-US.pak',
           '<(PRODUCT_DIR)/test_data/chrome/test/data/webui/assertions.js',
-          '<(PRODUCT_DIR)/test_data/chrome/test/data/webui/async_gen.js',
           '<(PRODUCT_DIR)/test_data/chrome/test/data/webui/chrome_send_browsertest.js',
           '<(PRODUCT_DIR)/test_data/chrome/test/data/webui/mock4js_browsertest.js',
+          '<(PRODUCT_DIR)/test_data/chrome/test/data/webui/net_internals/net_internals_test.js',
           '<(PRODUCT_DIR)/test_data/chrome/test/data/webui/print_preview.js',
           '<(PRODUCT_DIR)/theme_resources_standard.pak',
           '<(PRODUCT_DIR)/ui_resources_standard.pak',
@@ -1330,8 +1338,6 @@
           'test/data/extensions/api_test/tabs/capture_visible_tab/manifest.json',
           'test/data/extensions/good/Extensions/bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0/manifest.json',
           'test/data/webui/print_preview_hello_world_test.html',
-          'test/data/webui/test_api.js',
-          'third_party/mock4js/mock4js.js',
         ],
         'isolate_dependency_untracked': [
           '../third_party/WebKit/LayoutTests/fast/events/message-channel-gc.html',
@@ -1615,6 +1621,7 @@
           '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/options2_browsertest.js',
           '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/password_manager2_browsertest.js',
           '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/search_engine_manager2_browsertest.js',
+          '<(PRODUCT_DIR)/test_data/chrome/test/data/webui/net_internals/hsts_view.js',
           'test/data/extensions/api_test/accessibility/get_alerts_for_tab/background.js',
           'test/data/extensions/api_test/accessibility/get_alerts_for_tab/manifest.json',
           'test/data/extensions/api_test/alert/manifest.json',
@@ -1724,6 +1731,7 @@
         ],
         'isolate_dependency_untracked': [
           '../third_party/python_26/Lib/xml/parsers/',
+          '<(PRODUCT_DIR)/First Run',
           'test/data/extensions/api_test/content_scripts/css_l10n/_locales/',
           'test/data/extensions/api_test/content_scripts/existing_renderers/',
           'test/data/extensions/api_test/i18n/_locales/',
@@ -1738,9 +1746,6 @@
           'test/data/extensions/api_test/tabs/basics/f.html',
           'test/data/extensions/api_test/tabs/basics/tabs_util.js',
         ],
-        'isolate_dependency_untracked': [
-          'test/data/extensions/api_test/accessibility/',
-        ],
       },
     }],
   ],
diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
index bf2ca22..a744864 100644
--- a/chrome/unit_tests.isolate
+++ b/chrome/unit_tests.isolate
@@ -507,6 +507,7 @@
           '../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)/pyproto/google/__init__.py',
           '<(PRODUCT_DIR)/test_data/chrome/browser/resources/print_preview/print_preview_utils.js',
           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
@@ -530,6 +531,8 @@
           'test/data/extensions/unpacked/symlinks_allowed/manifest.json',
           'test/data/firefox3_pref.js',
           'test/data/firefox3_pref_pac_url.js',
+          'test/data/pref_service/read.need_empty_value.json',
+          'test/data/pref_service/write.golden.need_empty_value.json',
         ],
         'isolate_dependency_untracked': [
           '<(PRODUCT_DIR)/test_data/chrome/browser/resources/shared/',
@@ -562,6 +565,7 @@
     ['OS=="mac"', {
       'variables': {
         'isolate_dependency_tracked': [
+          '<(PRODUCT_DIR)/ffmpegsumo.so',
           'test/data/firefox2_nss_mac/libfreebl3.dylib',
           'test/data/firefox2_nss_mac/libnspr4.dylib',
           'test/data/firefox2_nss_mac/libnss3.dylib',
@@ -741,6 +745,9 @@
           '../third_party/python_26/Lib/xmlrpclib.py',
           '../third_party/python_26/python.exe',
           '../third_party/python_26/python26.dll',
+          '<(PRODUCT_DIR)/avcodec-54.dll',
+          '<(PRODUCT_DIR)/avformat-54.dll',
+          '<(PRODUCT_DIR)/avutil-51.dll',
           '<(PRODUCT_DIR)/icudt.dll',
           'test/data/extensions/permissions/audio-video.json',
           'test/data/safe_browsing/download_protection/signed.exe',
@@ -749,6 +756,7 @@
         ],
         'isolate_dependency_untracked': [
           '../ppapi/lib/gl/include/KHR/',
+          '../skia/ext/data/vectorcanvastest/basicdrawing/',
           '../skia/ext/data/vectorcanvastest/circles/',
           '../skia/ext/data/vectorcanvastest/clippingclean/',
           '../skia/ext/data/vectorcanvastest/clippingpath/',
diff --git a/net/net_unittests.isolate b/net/net_unittests.isolate
index 0fdbdaf..8e48373 100644
--- a/net/net_unittests.isolate
+++ b/net/net_unittests.isolate
@@ -4,31 +4,31 @@
 {
   'variables': {
     'isolate_dependency_tracked': [
-      '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)',
       '../testing/test_env.py',
       '../third_party/pyftpdlib/src/pyftpdlib/__init__.py',
       '../third_party/pyftpdlib/src/pyftpdlib/ftpserver.py',
+      '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)',
     ],
     'isolate_dependency_untracked': [
+      '../third_party/tlslite/tlslite/',
       'data/',
       'tools/testserver/',
-      '../third_party/tlslite/tlslite/',
     ],
   },
   'conditions': [
     ['OS=="linux"', {
       'variables': {
-        'isolate_dependency_tracked': [
-          '../testing/xvfb.py',
-          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
-        ],
         'command': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)',
           '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)',
         ],
+        'isolate_dependency_tracked': [
+          '../testing/xvfb.py',
+          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+        ],
       },
-    }, {  # else
+    }, {
       'variables': {
         'command': [
           '../testing/test_env.py',
@@ -39,6 +39,9 @@
     ['OS=="win"', {
       'variables': {
         'isolate_dependency_tracked': [
+          '<(PRODUCT_DIR)/icudt.dll',
+          'data/ssl/certificates/unittest.key.bin',
+          'data/ssl/certificates/unittest.selfsigned.der',
         ],
       },
     }],