diff --git a/.gitignore b/.gitignore
index 381acfa..3ceaf9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,8 +86,7 @@
 /tools/gyp
 /tools/protoc_wrapper
 /tools/python
-/tools/sharding_supervisor
-/tools/swarm_client
+/tools/swarming_client
 /tools/valgrind
 /tools/win
 /webrtc/modules/audio_device/android/test/bin/
diff --git a/DEPS b/DEPS
index 1e02b95..5d12eba 100644
--- a/DEPS
+++ b/DEPS
@@ -11,7 +11,7 @@
   "googlecode_url": "http://%s.googlecode.com/svn",
   "sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code",
   "chromium_trunk" : "http://src.chromium.org/svn/trunk",
-  "chromium_revision": "232627",
+  "chromium_revision": "238260",
 
   # A small subset of WebKit is needed for the Android Python test framework.
   "webkit_trunk": "http://src.chromium.org/blink/trunk",
@@ -104,11 +104,8 @@
   "tools/python":
     Var("chromium_trunk") + "/src/tools/python@" + Var("chromium_revision"),
 
-  "tools/sharding_supervisor":
-    Var("chromium_trunk") + "/src/tools/sharding_supervisor@" + Var("chromium_revision"),
-
-  "tools/swarm_client":
-    Var("chromium_trunk") + "/tools/swarm_client@" + Var("chromium_revision"),
+  "tools/swarming_client":
+    From("chromium_deps", "src/tools/swarming_client"),
 
   "tools/valgrind":
     Var("chromium_trunk") + "/src/tools/valgrind@" + Var("chromium_revision"),
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 433cdce..b7df908 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -110,7 +110,7 @@
                   r'^tools/python/.*\.py$',
                   r'^tools/python_charts/data/.*\.py$',
                   r'^tools/refactoring/.*\.py$',
-                  r'^tools/swarm_client/.*\.py$',
+                  r'^tools/swarming_client/.*\.py$',
                   # TODO(phoglund): should arguably be checked.
                   r'^tools/valgrind-webrtc/.*\.py$',
                   r'^tools/valgrind/.*\.py$',
diff --git a/talk/build/isolate.gypi b/talk/build/isolate.gypi
index 83dd502..7b0ac12 100644
--- a/talk/build/isolate.gypi
+++ b/talk/build/isolate.gypi
@@ -71,9 +71,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
@@ -94,7 +94,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 '/'.
@@ -114,7 +114,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/talk/examples/android/project.properties b/talk/examples/android/project.properties
index bc163b0..8459f9b 100644
--- a/talk/examples/android/project.properties
+++ b/talk/examples/android/project.properties
@@ -11,6 +11,6 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
+target=android-19
 
 java.compilerargs=-Xlint:all -Werror
diff --git a/talk/libjingle_media_unittest.isolate b/talk/libjingle_media_unittest.isolate
index 4c4ee31..36b50b5 100644
--- a/talk/libjingle_media_unittest.isolate
+++ b/talk/libjingle_media_unittest.isolate
@@ -30,7 +30,6 @@
       'variables': {
         'command': [
           '../testing/test_env.py',
-          '../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/libjingle_media_unittest<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -39,7 +38,7 @@
           '<(PRODUCT_DIR)/libjingle_media_unittest<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../tools/swarm_client/',
+          '../tools/swarming_client/',
         ],
       },
     }],
diff --git a/talk/libjingle_p2p_unittest.isolate b/talk/libjingle_p2p_unittest.isolate
index 848f234..b5ad4ff 100644
--- a/talk/libjingle_p2p_unittest.isolate
+++ b/talk/libjingle_p2p_unittest.isolate
@@ -30,7 +30,6 @@
       'variables': {
         'command': [
           '../testing/test_env.py',
-          '../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/libjingle_p2p_unittest<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -38,7 +37,7 @@
           '<(PRODUCT_DIR)/libjingle_p2p_unittest<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../tools/swarm_client/',
+          '../tools/swarming_client/',
         ],
       },
     }],
diff --git a/talk/libjingle_peerconnection_unittest.isolate b/talk/libjingle_peerconnection_unittest.isolate
index 660ffd5..e7dd687 100644
--- a/talk/libjingle_peerconnection_unittest.isolate
+++ b/talk/libjingle_peerconnection_unittest.isolate
@@ -30,7 +30,6 @@
       'variables': {
         'command': [
           '../testing/test_env.py',
-          '../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/libjingle_peerconnection_unittest<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -38,7 +37,7 @@
           '<(PRODUCT_DIR)/libjingle_peerconnection_unittest<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../tools/swarm_client/',
+          '../tools/swarming_client/',
         ],
       },
     }],
diff --git a/talk/libjingle_sound_unittest.isolate b/talk/libjingle_sound_unittest.isolate
index 6da7d88..7166337 100644
--- a/talk/libjingle_sound_unittest.isolate
+++ b/talk/libjingle_sound_unittest.isolate
@@ -30,7 +30,6 @@
       'variables': {
         'command': [
           '../testing/test_env.py',
-          '../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/libjingle_sound_unittest<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -38,7 +37,7 @@
           '<(PRODUCT_DIR)/libjingle_sound_unittest<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../tools/swarm_client/',
+          '../tools/swarming_client/',
         ],
       },
     }],
diff --git a/talk/libjingle_unittest.isolate b/talk/libjingle_unittest.isolate
index efb8625..e678af0 100644
--- a/talk/libjingle_unittest.isolate
+++ b/talk/libjingle_unittest.isolate
@@ -30,7 +30,6 @@
       'variables': {
         'command': [
           '../testing/test_env.py',
-          '../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/libjingle_unittest<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -38,7 +37,7 @@
           '<(PRODUCT_DIR)/libjingle_unittest<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../tools/swarm_client/',
+          '../tools/swarming_client/',
         ],
       },
     }],
diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index b96e00f..aab65ea 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -178,6 +178,7 @@
               # that get overridden by -Wextra.
               '-Wno-unused-parameter',
               '-Wno-missing-field-initializers',
+              '-Wno-strict-overflow',
             ],
             'cflags_cc': [
               '-Wnon-virtual-dtor',
diff --git a/webrtc/build/isolate.gypi b/webrtc/build/isolate.gypi
index 91b92a6..510c47e 100644
--- a/webrtc/build/isolate.gypi
+++ b/webrtc/build/isolate.gypi
@@ -52,9 +52,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
@@ -75,7 +75,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 '/'.
@@ -95,7 +95,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/webrtc/common_audio/common_audio_unittests.isolate b/webrtc/common_audio/common_audio_unittests.isolate
index ca4bee6..49f1e98 100644
--- a/webrtc/common_audio/common_audio_unittests.isolate
+++ b/webrtc/common_audio/common_audio_unittests.isolate
@@ -21,7 +21,6 @@
       'variables': {
         'command': [
           '../../testing/test_env.py',
-          '../../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/common_audio_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -29,7 +28,7 @@
           '<(PRODUCT_DIR)/common_audio_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../../tools/swarm_client/',
+          '../../tools/swarming_client/',
         ],
       },
     }],
diff --git a/webrtc/common_video/common_video_unittests.isolate b/webrtc/common_video/common_video_unittests.isolate
index 06d86dc..a95bd41 100644
--- a/webrtc/common_video/common_video_unittests.isolate
+++ b/webrtc/common_video/common_video_unittests.isolate
@@ -21,7 +21,6 @@
       'variables': {
         'command': [
           '../../testing/test_env.py',
-          '../../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/common_video_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -31,7 +30,7 @@
           '<(PRODUCT_DIR)/common_video_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../../tools/swarm_client/',
+          '../../tools/swarming_client/',
         ],
       },
     }],
diff --git a/webrtc/modules/audio_coding/neteq/neteq_unittests.isolate b/webrtc/modules/audio_coding/neteq/neteq_unittests.isolate
index 3e540c3..e8f4e48 100644
--- a/webrtc/modules/audio_coding/neteq/neteq_unittests.isolate
+++ b/webrtc/modules/audio_coding/neteq/neteq_unittests.isolate
@@ -21,7 +21,6 @@
       'variables': {
         'command': [
           '../../../../testing/test_env.py',
-          '../../../../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/neteq_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_touched': [
@@ -37,7 +36,7 @@
           '<(PRODUCT_DIR)/neteq_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../../../../tools/swarm_client/',
+          '../../../../tools/swarming_client/',
         ],
       },
     }],
diff --git a/webrtc/modules/audio_coding/neteq4/audio_decoder_unittests.isolate b/webrtc/modules/audio_coding/neteq4/audio_decoder_unittests.isolate
index d2d858c..bb57e74 100644
--- a/webrtc/modules/audio_coding/neteq4/audio_decoder_unittests.isolate
+++ b/webrtc/modules/audio_coding/neteq4/audio_decoder_unittests.isolate
@@ -21,7 +21,6 @@
       'variables': {
         'command': [
           '../../../../testing/test_env.py',
-          '../../../../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/audio_decoder_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_touched': [
@@ -33,7 +32,7 @@
           '<(PRODUCT_DIR)/audio_decoder_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../../../../tools/swarm_client/',
+          '../../../../tools/swarming_client/',
         ],
       },
     }],
diff --git a/webrtc/modules/audio_device/android/test/project.properties b/webrtc/modules/audio_device/android/test/project.properties
index dc510e3..8459f9b 100644
--- a/webrtc/modules/audio_device/android/test/project.properties
+++ b/webrtc/modules/audio_device/android/test/project.properties
@@ -11,6 +11,6 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
+target=android-19
 
-java.compilerargs=-Xlint:all -Werror
\ No newline at end of file
+java.compilerargs=-Xlint:all -Werror
diff --git a/webrtc/modules/audio_device/audio_device_tests.isolate b/webrtc/modules/audio_device/audio_device_tests.isolate
index 8f336cd..69e877c 100644
--- a/webrtc/modules/audio_device/audio_device_tests.isolate
+++ b/webrtc/modules/audio_device/audio_device_tests.isolate
@@ -21,7 +21,6 @@
       'variables': {
         'command': [
           '../../../testing/test_env.py',
-          '../../../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/audio_device_tests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -29,7 +28,7 @@
           '<(PRODUCT_DIR)/audio_device_tests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../../../tools/swarm_client/',
+          '../../../tools/swarming_client/',
         ],
       },
     }],
diff --git a/webrtc/modules/modules_tests.isolate b/webrtc/modules/modules_tests.isolate
index c24ff9c..7a051f6 100644
--- a/webrtc/modules/modules_tests.isolate
+++ b/webrtc/modules/modules_tests.isolate
@@ -21,7 +21,6 @@
       'variables': {
         'command': [
           '../../testing/test_env.py',
-          '../../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/modules_tests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -34,7 +33,7 @@
           '<(PRODUCT_DIR)/modules_tests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../../tools/swarm_client/',
+          '../../tools/swarming_client/',
         ],
       },
     }],
diff --git a/webrtc/modules/modules_unittests.isolate b/webrtc/modules/modules_unittests.isolate
index 32fc662..aa91238 100644
--- a/webrtc/modules/modules_unittests.isolate
+++ b/webrtc/modules/modules_unittests.isolate
@@ -21,7 +21,6 @@
       'variables': {
         'command': [
           '../../testing/test_env.py',
-          '../../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -79,7 +78,7 @@
           '<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../../tools/swarm_client/',
+          '../../tools/swarming_client/',
         ],
       },
     }],
diff --git a/webrtc/modules/video_capture/video_capture_tests.isolate b/webrtc/modules/video_capture/video_capture_tests.isolate
index d07255f..30374ce 100644
--- a/webrtc/modules/video_capture/video_capture_tests.isolate
+++ b/webrtc/modules/video_capture/video_capture_tests.isolate
@@ -21,7 +21,6 @@
       'variables': {
         'command': [
           '../../../testing/test_env.py',
-          '../../../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/video_capture_tests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -29,7 +28,7 @@
           '<(PRODUCT_DIR)/video_capture_tests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../../../tools/swarm_client/',
+          '../../../tools/swarming_client/',
         ],
       },
     }],
diff --git a/webrtc/modules/video_render/video_render_tests.isolate b/webrtc/modules/video_render/video_render_tests.isolate
index faf03be..397ec04 100644
--- a/webrtc/modules/video_render/video_render_tests.isolate
+++ b/webrtc/modules/video_render/video_render_tests.isolate
@@ -21,7 +21,6 @@
       'variables': {
         'command': [
           '../../../testing/test_env.py',
-          '../../../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/video_render_tests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -29,7 +28,7 @@
           '<(PRODUCT_DIR)/video_render_tests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../../../tools/swarm_client/',
+          '../../../tools/swarming_client/',
         ],
       },
     }],
diff --git a/webrtc/system_wrappers/source/system_wrappers_unittests.isolate b/webrtc/system_wrappers/source/system_wrappers_unittests.isolate
index b03e4b8..6ec5e7c 100644
--- a/webrtc/system_wrappers/source/system_wrappers_unittests.isolate
+++ b/webrtc/system_wrappers/source/system_wrappers_unittests.isolate
@@ -22,7 +22,6 @@
       'variables': {
         'command': [
           '../../../testing/test_env.py',
-          '../../../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/system_wrappers_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -30,7 +29,7 @@
           '<(PRODUCT_DIR)/system_wrappers_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../../../tools/swarm_client/',
+          '../../../tools/swarming_client/',
         ],
       },
     }],
diff --git a/webrtc/test/metrics_unittests.isolate b/webrtc/test/metrics_unittests.isolate
index a9fb1d8..1a196d6 100644
--- a/webrtc/test/metrics_unittests.isolate
+++ b/webrtc/test/metrics_unittests.isolate
@@ -21,7 +21,6 @@
       'variables': {
         'command': [
           '../../testing/test_env.py',
-          '../../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/metrics_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -31,7 +30,7 @@
           '<(PRODUCT_DIR)/metrics_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../../tools/swarm_client/',
+          '../../tools/swarming_client/',
         ],
       },
     }],
diff --git a/webrtc/test/test_support_unittests.isolate b/webrtc/test/test_support_unittests.isolate
index b885d44..0f5de65 100644
--- a/webrtc/test/test_support_unittests.isolate
+++ b/webrtc/test/test_support_unittests.isolate
@@ -21,7 +21,6 @@
       'variables': {
         'command': [
           '../../testing/test_env.py',
-          '../../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/test_support_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -30,7 +29,7 @@
           '<(PRODUCT_DIR)/test_support_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../../tools/swarm_client/',
+          '../../tools/swarming_client/',
         ],
       },
     }],
diff --git a/webrtc/tools/tools_unittests.isolate b/webrtc/tools/tools_unittests.isolate
index 618c6db..5403780 100644
--- a/webrtc/tools/tools_unittests.isolate
+++ b/webrtc/tools/tools_unittests.isolate
@@ -21,7 +21,6 @@
       'variables': {
         'command': [
           '../../testing/test_env.py',
-          '../../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/tools_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -31,7 +30,7 @@
           '<(PRODUCT_DIR)/tools_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../../tools/swarm_client/',
+          '../../tools/swarming_client/',
         ],
       },
     }],
diff --git a/webrtc/video_engine/test/android/project.properties b/webrtc/video_engine/test/android/project.properties
index 8cb5d3b..162fe60 100644
--- a/webrtc/video_engine/test/android/project.properties
+++ b/webrtc/video_engine/test/android/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
\ No newline at end of file
+target=android-19
diff --git a/webrtc/video_engine/test/auto_test/vie_auto_test.isolate b/webrtc/video_engine/test/auto_test/vie_auto_test.isolate
index 8ce6a15..577e63f 100644
--- a/webrtc/video_engine/test/auto_test/vie_auto_test.isolate
+++ b/webrtc/video_engine/test/auto_test/vie_auto_test.isolate
@@ -21,7 +21,6 @@
       'variables': {
         'command': [
           '../../../../testing/test_env.py',
-          '../../../../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/vie_auto_test<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_touched': [
@@ -32,7 +31,7 @@
           '<(PRODUCT_DIR)/vie_auto_test<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../../tools/swarm_client/',
+          '../../tools/swarming_client/',
         ],
       },
     }],
diff --git a/webrtc/video_engine/video_engine_core_unittests.isolate b/webrtc/video_engine/video_engine_core_unittests.isolate
index 717e79c..941cbad 100644
--- a/webrtc/video_engine/video_engine_core_unittests.isolate
+++ b/webrtc/video_engine/video_engine_core_unittests.isolate
@@ -21,7 +21,6 @@
       'variables': {
         'command': [
           '../../testing/test_env.py',
-          '../../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/video_engine_core_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -29,7 +28,7 @@
           '<(PRODUCT_DIR)/video_engine_core_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../../tools/swarm_client/',
+          '../../tools/swarming_client/',
         ],
       },
     }],
diff --git a/webrtc/video_engine_tests.isolate b/webrtc/video_engine_tests.isolate
index 4108041..f893423 100644
--- a/webrtc/video_engine_tests.isolate
+++ b/webrtc/video_engine_tests.isolate
@@ -21,7 +21,6 @@
       'variables': {
         'command': [
           '../testing/test_env.py',
-          '../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/video_engine_tests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -33,7 +32,7 @@
           '<(PRODUCT_DIR)/video_engine_tests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../tools/swarm_client/',
+          '../tools/swarming_client/',
         ],
       },
     }],
diff --git a/webrtc/voice_engine/voe_auto_test.isolate b/webrtc/voice_engine/voe_auto_test.isolate
index 11a3fd5..651d074 100644
--- a/webrtc/voice_engine/voe_auto_test.isolate
+++ b/webrtc/voice_engine/voe_auto_test.isolate
@@ -21,7 +21,6 @@
       'variables': {
         'command': [
           '../../testing/test_env.py',
-          '../../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/voe_auto_test<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -29,7 +28,7 @@
           '<(PRODUCT_DIR)/voe_auto_test<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../../tools/swarm_client/',
+          '../../tools/swarming_client/',
         ],
       },
     }],
diff --git a/webrtc/voice_engine/voice_engine_unittests.isolate b/webrtc/voice_engine/voice_engine_unittests.isolate
index 49d8a3d..c350bce 100644
--- a/webrtc/voice_engine/voice_engine_unittests.isolate
+++ b/webrtc/voice_engine/voice_engine_unittests.isolate
@@ -21,7 +21,6 @@
       'variables': {
         'command': [
           '../../testing/test_env.py',
-          '../../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/voice_engine_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -29,7 +28,7 @@
           '<(PRODUCT_DIR)/voice_engine_unittests<(EXECUTABLE_SUFFIX)',
         ],
        'isolate_dependency_untracked': [
-          '../../tools/swarm_client/',
+          '../../tools/swarming_client/',
         ],
       },
     }],