1 files changed, 43 insertions, 44 deletions
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
index 1c260f4..efa91ed 100644
--- a/chrome/browser_tests.isolate
+++ b/chrome/browser_tests.isolate
@@ -3,47 +3,63 @@
 # found in the LICENSE file.
 {
   'conditions': [
+    ['OS=="linux"', {
+      'variables': {
+        'command': [
+          '../testing/xvfb.py',
+          '<(PRODUCT_DIR)',
+          '../tools/swarm_client/run_test_cases.py',
+          '--use-less-jobs',
+          '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
+        ],
+        'isolate_dependency_tracked': [
+          '../testing/xvfb.py',
+          '<(PRODUCT_DIR)/DumpRenderTree<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/chrome.pak',
+          '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/libffmpegsumo.so',
+          '<(PRODUCT_DIR)/libosmesa.so',
+          '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
+          '<(PRODUCT_DIR)/libppapi_tests.so',
+          '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+          'browser/nacl_host/test/debug_stub_browser_tests.py',
+          'browser/nacl_host/test/gdb_rsp.py',
+        ],
+      },
+    }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'isolate_dependency_tracked': [
           '../ppapi/tests/test_case.html',
           '../ppapi/tests/test_page.css',
           '../testing/test_env.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',
         ],
         'isolate_dependency_untracked': [
           '../content/test/data/',
           '../net/data/',
           '../net/tools/testserver/',
+          '../third_party/WebKit/Tools/Scripts/',
           '../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)/pyproto/',
           '<(PRODUCT_DIR)/test_data/chrome/',
+          'common/extensions/docs/examples/apps/calculator/tests/',
+          'test/data/',
+          'third_party/mock4js/',
         ],
       },
     }],
-    ['OS=="mac" or OS=="win"', {
-      'variables': {
-        'command': [
-          '../testing/test_env.py',
-          '../tools/swarm_client/run_test_cases.py',
-          '--use-less-jobs',
-          '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
-    ['OS=="win" or OS=="linux"', {
+    ['OS=="linux" or OS=="win"', {
       'variables': {
         'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/chrome_100_percent.pak',
@@ -67,7 +83,6 @@
           'common/extensions/docs/examples/apps/calculator/app/view.js',
         ],
         'isolate_dependency_untracked': [
-          '../net/data/websocket/',
           '../third_party/accessibility-developer-tools/gen/',
           '../third_party/bidichecker/',
           '../third_party/safe_browsing/',
@@ -79,32 +94,6 @@
         ],
       },
     }],
-    ['OS=="linux"', {
-      'variables': {
-        'command': [
-          '../testing/xvfb.py',
-          '<(PRODUCT_DIR)',
-          '../tools/swarm_client/run_test_cases.py',
-          '--use-less-jobs',
-          '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
-        ],
-        'isolate_dependency_tracked': [
-          '../testing/xvfb.py',
-          '<(PRODUCT_DIR)/DumpRenderTree<(EXECUTABLE_SUFFIX)',
-          '<(PRODUCT_DIR)/chrome.pak',
-          '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)',
-          '<(PRODUCT_DIR)/libffmpegsumo.so',
-          '<(PRODUCT_DIR)/libosmesa.so',
-          '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
-          '<(PRODUCT_DIR)/libppapi_tests.so',
-          '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)',
-          '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)',
-          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
-          'browser/nacl_host/test/debug_stub_browser_tests.py',
-          'browser/nacl_host/test/gdb_rsp.py',
-        ],
-      },
-    }],
     ['OS=="mac"', {
       'variables': {
         'isolate_dependency_tracked': [
@@ -121,6 +110,16 @@
         ],
       },
     }],
+    ['OS=="mac" or OS=="win"', {
+      'variables': {
+        'command': [
+          '../testing/test_env.py',
+          '../tools/swarm_client/run_test_cases.py',
+          '--use-less-jobs',
+          '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
+        ],
+      },
+    }],
     ['OS=="win"', {
       'variables': {
         'isolate_dependency_tracked': [