Revert 240460 "Roll swarm_client @ 9fc05789e3."

trunk/src/build/isolate.gypi

Index: trunk/src/build/isolate.gypi
===================================================================
--- trunk/src/build/isolate.gypi	(revision 240527)
+++ trunk/src/build/isolate.gypi	(working copy)
@@ -33,9 +33,6 @@
 #
 # The generated .isolated file will be:
 #   <(PRODUCT_DIR)/foo_test.isolated
-#
-# See http://dev.chromium.org/developers/testing/isolated-testing/for-swes
-# for more information.
 
 {
   'rules': [
@@ -46,6 +43,7 @@
         # Files that are known to be involved in this step.
         '<(DEPTH)/tools/swarming_client/isolate.py',
         '<(DEPTH)/tools/swarming_client/run_isolated.py',
+        '<(DEPTH)/tools/swarming_client/googletest/run_test_cases.py',
 
         # Disable file tracking by the build driver for now. This means the
         # project must have the proper build-time dependency for their runtime
@@ -68,8 +66,8 @@
         '<(test_isolation_mode)',
         # Variables should use the -V FOO=<(FOO) form so frequent values,
         # like '0' or '1', aren't stripped out by GYP.
-        '--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ',
-        '--config-variable', 'OS=<(OS)',
+        '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ',
+        '--variable', 'OS=<(OS)',
         '--result', '<@(_outputs)',
         '--isolate', '<(RULE_INPUT_PATH)',
       ],
@@ -78,9 +76,7 @@
         ['OS=="mac"', {
           # <(mac_product_name) can contain a space, so don't use FOO=<(FOO)
           # form.
-          'action': [
-            '--extra-variable', 'mac_product_name', '<(mac_product_name)',
-          ],
+          'action': [ '--variable', 'mac_product_name', '<(mac_product_name)' ],
         }],
         ["test_isolation_outdir==''", {
           # GYP will eliminate duplicate arguments so '<(PRODUCT_DIR)' cannot