Revert r217535 "Move swarm_client to swarming_client."

content/content_browsertests.isolate

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'conditions': [
     ['OS=="android"', {
       'variables': {
         'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak',
         ],
         'isolate_dependency_untracked': [
           '../third_party/webgl_conformance/',
         ],
       },
     }],
     ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'isolate_dependency_untracked': [
           '../net/data/',
           'test/data/',
         ],
       },
     }],
     ['OS=="linux"', {
       'variables': {
         'command': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)',
-          '../tools/swarming_client/googletest/run_test_cases.py',
+          '../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)/content_shell.pak',
           '<(PRODUCT_DIR)/fonts.conf',
           '<(PRODUCT_DIR)/libclearkeycdm.so',
           '<(PRODUCT_DIR)/libclearkeycdmadapter.so',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/plugins/libTestNetscapePlugin.so',
           '<(PRODUCT_DIR)/plugins/libnpapi_test_plugin.so',
         ],
       },
     }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'isolate_dependency_tracked': [
           '../testing/test_env.py',
-          '../tools/swarming_client/run_isolated.py',
-          '../tools/swarming_client/googletest/run_test_cases.py',
+          '../tools/swarm_client/run_isolated.py',
+          '../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
           '../net/tools/testserver/',
           '../third_party/WebKit/Tools/Scripts/',
           '../third_party/lighttpd/',
           '../third_party/pyftpdlib/',
           '../third_party/pywebsocket/',
           '../third_party/tlslite/',
         ],
@@ skipping 10 matching lines @@
         ],
         'isolate_dependency_untracked': [
           '<(PRODUCT_DIR)/Content Shell.app/',
         ],
       },
     }],
     ['OS=="mac" or OS=="win"', {
       'variables': {
         'command': [
           '../testing/test_env.py',
-          '../tools/swarming_client/googletest/run_test_cases.py',
+          '../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
     ['OS=="win"', {
       'variables': {
         'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/ffmpegsumo.dll',
           '<(PRODUCT_DIR)/chrome_100_percent.pak',
           '<(PRODUCT_DIR)/clearkeycdm.dll',
           '<(PRODUCT_DIR)/clearkeycdmadapter.dll',
           '<(PRODUCT_DIR)/content_shell.pak',
           '<(PRODUCT_DIR)/plugins/npTestNetscapePlugIn.dll',
           '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll',
         ],
         'isolate_dependency_untracked': [
           # The two directories below are only needed for
           # WorkerXHRHttpLayoutTest.Tests which are currently disabled.
           #'../third_party/cygwin/',
           #'../third_party/perl/perl/',
           '../third_party/python_26/',
         ],
       },
     }],
   ],
 }