Use swarming_client instead of swarm_client.

Modify all the references to use src/tools/swarming_client/.

The build scripts already support both.

R=csharp@chromium.org, torne@chromium.org
BUG=

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

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

16 files changed, 25 insertions, 24 deletions

diff --git a/.gitignore b/.gitignore
index 767bdf5..8b40107 100644
--- a/.gitignore
+++ b/.gitignore
@@ -315,7 +315,7 @@ v8.log
 /tools/page_cycler/acid3
 /tools/perf/data
 /tools/perf/results.html
-/tools/swarm_client
+/tools/swarming_client
 /tools/tryserver
 /tools/win/link_limiter/build
 /ui/surface/surface.xml
diff --git a/DEPS b/DEPS
index eafaaa9..361ca1a 100644
--- a/DEPS
+++ b/DEPS
@@ -54,9 +54,9 @@ vars = {
   "jsoncpp_revision": "248",
   "nss_revision": "231937",
   # Three lines of non-changing comments so that
-  # the commit queue can handle CLs rolling swarm_client
+  # the commit queue can handle CLs rolling swarming_client
   # and whatever else without interference from each other.
-  "swarm_revision": "230741",
+  "swarming_revision": "141ef86f4abf255e578320bfe6e42006c251bc39",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling openssl
   # and whatever else without interference from each other.
@@ -117,8 +117,9 @@ deps = {
   "src/tools/gyp":
     (Var("googlecode_url") % "gyp") + "/trunk@1773",
 
-  "src/tools/swarm_client":
-    "/trunk/tools/swarm_client@" + Var("swarm_revision"),
+  "src/tools/swarming_client":
+    Var("chromium_git") + "/external/swarming.client.git@" +
+        Var("swarming_revision"),
 
   "src/v8":
     (Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"),
diff --git a/android_webview/tools/webview_licenses.py b/android_webview/tools/webview_licenses.py
index d3233b3..0348e91 100755
--- a/android_webview/tools/webview_licenses.py
+++ b/android_webview/tools/webview_licenses.py
@@ -192,7 +192,7 @@ def _FindThirdPartyDirs():
     # provide a way to shadow experimental buildfiles into those directories.
     os.path.join('tools', 'gn', 'secondary'),
     # Not shipped, Chromium code
-    os.path.join('tools', 'swarm_client'),
+    os.path.join('tools', 'swarming_client'),
   ]
   third_party_dirs = licenses.FindThirdPartyDirs(prune_paths, REPOSITORY_ROOT)
   return licenses.FilterDirsWithFiles(third_party_dirs, REPOSITORY_ROOT)
diff --git a/base/base_unittests.isolate b/base/base_unittests.isolate
index dd9e6b8..c2150c7 100644
--- a/base/base_unittests.isolate
+++ b/base/base_unittests.isolate
@@ -32,7 +32,7 @@
           '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../tools/swarm_client/',
+          '../tools/swarming_client/',
         ],
       },
     }],
diff --git a/build/android/pylib/gtest/setup.py b/build/android/pylib/gtest/setup.py
index 4508d7c..da3dc66 100644
--- a/build/android/pylib/gtest/setup.py
+++ b/build/android/pylib/gtest/setup.py
@@ -87,7 +87,7 @@ _DEPS_EXCLUSION_LIST = [
 ]
 
 _ISOLATE_SCRIPT = os.path.join(
-    constants.DIR_SOURCE_ROOT, 'tools', 'swarm_client', 'isolate.py')
+    constants.DIR_SOURCE_ROOT, 'tools', 'swarming_client', 'isolate.py')
 
 
 def _GenerateDepsDirUsingIsolate(suite_name):
diff --git a/build/common.gypi b/build/common.gypi
index 869696b..873ee17 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -698,7 +698,7 @@
         # Whether tests targets should be run, archived or just have the
         # dependencies verified. All the tests targets have the '_run' suffix,
         # e.g. base_unittests_run runs the target base_unittests. The test
-        # target always calls tools/swarm_client/isolate.py. See the script's
+        # target always calls tools/swarming_client/isolate.py. See the script's
         # --help for more information and the valid --mode values. Meant to be
         # overriden with GYP_DEFINES.
         # TODO(maruel): Remove the conditions as more configurations are
diff --git a/build/isolate.gypi b/build/isolate.gypi
index 76882c7..0f3c84a 100644
--- a/build/isolate.gypi
+++ b/build/isolate.gypi
@@ -41,9 +41,9 @@
       'extension': 'isolate',
       'inputs': [
         # Files that are known to be involved in this step.
-        '<(DEPTH)/tools/swarm_client/isolate.py',
-        '<(DEPTH)/tools/swarm_client/run_isolated.py',
-        '<(DEPTH)/tools/swarm_client/googletest/run_test_cases.py',
+        '<(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
@@ -64,7 +64,7 @@
         ["test_isolation_outdir==''", {
           'action': [
             'python',
-            '<(DEPTH)/tools/swarm_client/isolate.py',
+            '<(DEPTH)/tools/swarming_client/isolate.py',
             '<(test_isolation_mode)',
             # GYP will eliminate duplicate arguments so '<(PRODUCT_DIR)' cannot
             # be provided twice. To work around this behavior, append '/'.
@@ -84,7 +84,7 @@
         }, {
           'action': [
             'python',
-            '<(DEPTH)/tools/swarm_client/isolate.py',
+            '<(DEPTH)/tools/swarming_client/isolate.py',
             '<(test_isolation_mode)',
             '--outdir', '<(test_isolation_outdir)',
             # See comment above.
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
index 150f018..8d590c6 100644
--- a/chrome/browser_tests.isolate
+++ b/chrome/browser_tests.isolate
@@ -67,7 +67,7 @@
           '../third_party/safe_browsing/',
           '../third_party/simplejson/',
           '../third_party/tlslite/',
-          '../tools/swarm_client/',
+          '../tools/swarming_client/',
           '<(PRODUCT_DIR)/nacl_test_data/',
           '<(PRODUCT_DIR)/pnacl/',
           '<(PRODUCT_DIR)/pseudo_locales/',
diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate
index 7f9fc0e..ff3486a 100644
--- a/chrome/interactive_ui_tests.isolate
+++ b/chrome/interactive_ui_tests.isolate
@@ -36,7 +36,7 @@
           '../third_party/pyftpdlib/',
           '../third_party/pywebsocket/src/mod_pywebsocket/',
           '../third_party/tlslite/tlslite/',
-          '../tools/swarm_client/',
+          '../tools/swarming_client/',
           'test/data/',
         ],
       },
diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate
index 3861306..460bde8 100644
--- a/chrome/sync_integration_tests.isolate
+++ b/chrome/sync_integration_tests.isolate
@@ -43,7 +43,7 @@
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'isolate_dependency_untracked': [
-          '../tools/swarm_client/',
+          '../tools/swarming_client/',
           '<(PRODUCT_DIR)/pyproto/',
         ],
       },
diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
index 3f077d6..e91886b 100644
--- a/chrome/unit_tests.isolate
+++ b/chrome/unit_tests.isolate
@@ -67,7 +67,7 @@
           '../third_party/pyftpdlib/',
           '../third_party/pywebsocket/',
           '../third_party/tlslite/',
-          '../tools/swarm_client/',
+          '../tools/swarming_client/',
           '<(PRODUCT_DIR)/pyproto/',
         ],
       },
diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate
index 975c39e..4cc0900 100644
--- a/content/content_browsertests.isolate
+++ b/content/content_browsertests.isolate
@@ -53,7 +53,7 @@
           '../third_party/pyftpdlib/',
           '../third_party/pywebsocket/',
           '../third_party/tlslite/',
-          '../tools/swarm_client/',
+          '../tools/swarming_client/',
         ],
       },
     }],
diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate
index 92a448b..0643ce0 100644
--- a/content/content_unittests.isolate
+++ b/content/content_unittests.isolate
@@ -26,7 +26,7 @@
           '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../tools/swarm_client/',
+          '../tools/swarming_client/',
         ],
       },
     }],
diff --git a/net/net_unittests.isolate b/net/net_unittests.isolate
index 2d120bf..c105892 100644
--- a/net/net_unittests.isolate
+++ b/net/net_unittests.isolate
@@ -31,7 +31,7 @@
           '../third_party/pyftpdlib/',
           '../third_party/pywebsocket/',
           '../third_party/tlslite/',
-          '../tools/swarm_client/',
+          '../tools/swarming_client/',
           '<(PRODUCT_DIR)/pyproto/',
           'tools/testserver/',
         ],
diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py
index 179e810..f53150e 100755
--- a/tools/checklicenses/checklicenses.py
+++ b/tools/checklicenses/checklicenses.py
@@ -364,12 +364,12 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
     ],
 
     # https://code.google.com/p/colorama/issues/detail?id=44
-    'tools/swarm_client/third_party/colorama': [
+    'tools/swarming_client/third_party/colorama': [
         'UNKNOWN',
     ],
 
     # https://github.com/kennethreitz/requests/issues/1610
-    'tools/swarm_client/third_party/requests': [
+    'tools/swarming_client/third_party/requests': [
         'UNKNOWN',
     ],
 
diff --git a/tools/licenses.py b/tools/licenses.py
index 00be991..2fab8a5 100755
--- a/tools/licenses.py
+++ b/tools/licenses.py
@@ -56,7 +56,7 @@ PRUNE_PATHS = set([
 
     # Chromium code in third_party.
     os.path.join('third_party','fuzzymatch'),
-    os.path.join('tools', 'swarm_client'),
+    os.path.join('tools', 'swarming_client'),
 
     # Stuff pulled in from chrome-internal for official builds/tools.
     os.path.join('third_party', 'clear_cache'),