Revert 240460 "Roll swarm_client @ 9fc05789e3."

Speculative revert because base_unittests and net_unittests are failing
on almost all of the Windows builders, with errors like:

[------ Swarming Error ------]
Input file E:\b\build\slave\Win7_Tests__3_\build\src\build\Release\chrome_100_percent.pak doesn't exist

> Roll swarm_client @ 9fc05789e3.
> 
> Includes revert of r240243.
> 
> $ git log aab3a62beb..9fc05789e3 --date=short --format="%ad %ae %s" | sed 's/@chromium\.org//'
> 2013-12-11 ganetsky Create a .gitignore file and add *.pyc to it
> 2013-12-11 maruel Stop signalling swarming error on Windows file locking.
> 2013-12-11 maruel Ensure variables are decoded to unicode.
> 2013-12-06 maruel Rename --command-variable to --extra-variables.
> 2013-12-06 maruel Add real variable support and split --variable in 3 different flags.
> 2013-12-05 vadimsh Add 'offset' parameter to StorageApi.fetch(...) method.
> 2013-12-05 maruel Change log message to be clearer.
> 2013-12-05 vadimsh Support custom HTTP headers in net.url_open.
> 2013-12-03 vadimsh Remove urllib2 support.
> 2013-12-03 vadimsh Wait for Storage's internal threads to finish before exiting.
> 2013-12-03 vadimsh Fix swarming_smoke_test.py and isolateserver_test.py.
> 
> R=vadimsh@chromium.org
> NOTRY=true
> BUG=
> 
> Review URL: https://codereview.chromium.org/113553003

TBR=maruel@chromium.org

Review URL: https://codereview.chromium.org/101143003

git-svn-id: http://src.chromium.org/svn/trunk/src/build@240528 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

android/pylib/gtest/setup.py

@@ -114,8 +114,8 @@ def _GenerateDepsDirUsingIsolate(suite_name):
       'remap',
       '--isolate', isolate_abs_path,
       '--isolated', isolated_abs_path,
-      '--path-variable', 'PRODUCT_DIR', constants.GetOutDirectory(),
-      '--config-variable', 'OS', 'android',
+      '-V', 'PRODUCT_DIR=%s' % constants.GetOutDirectory(),
+      '-V', 'OS=android',
       '--outdir', constants.ISOLATE_DEPS_DIR,
   ]
   assert not cmd_helper.RunCmd(isolate_cmd)

isolate.gypi

@@ -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