Manually roll catapult to pick up the addition of device_denylist.py.

also fix run-swarmed.py s.t. it passes task aruguments through to the
task rather than to the swarming client binary.

Bug: 1097306
Change-Id: Ie77dc360a1a0bb4c6370abc00d46b1dd5672ed98
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2255029
Commit-Queue: John Budorick <jbudorick@chromium.org>
Auto-Submit: John Budorick <jbudorick@chromium.org>
Reviewed-by: Nate Fischer <ntfschr@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#781174}

DEPS

@@ -245,7 +245,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling catapult
   # and whatever else without interference from each other.
-  'catapult_revision': '80948d0b7803eb1cd2b78aecae0757f8e0115a8d',
+  'catapult_revision': '2641327e3d383ad5884162c1a8ea90599b02fc0a',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libFuzzer
   # and whatever else without interference from each other.

android_webview/tools/run_cts.pydeps

@@ -35,7 +35,7 @@
 //third_party/catapult/devil/devil/android/constants/chrome.py
 //third_party/catapult/devil/devil/android/constants/file_system.py
 //third_party/catapult/devil/devil/android/decorators.py
-//third_party/catapult/devil/devil/android/device_blacklist.py
+//third_party/catapult/devil/devil/android/device_denylist.py
 //third_party/catapult/devil/devil/android/device_errors.py
 //third_party/catapult/devil/devil/android/device_signal.py
 //third_party/catapult/devil/devil/android/device_temp_file.py

build/android/gyp/create_bundle_wrapper_script.pydeps

@@ -22,7 +22,7 @@
 ../../../third_party/catapult/devil/devil/android/constants/chrome.py
 ../../../third_party/catapult/devil/devil/android/constants/file_system.py
 ../../../third_party/catapult/devil/devil/android/decorators.py
-../../../third_party/catapult/devil/devil/android/device_blacklist.py
+../../../third_party/catapult/devil/devil/android/device_denylist.py
 ../../../third_party/catapult/devil/devil/android/device_errors.py
 ../../../third_party/catapult/devil/devil/android/device_signal.py
 ../../../third_party/catapult/devil/devil/android/device_temp_file.py

build/android/test_runner.pydeps

@@ -48,6 +48,7 @@
 ../../third_party/catapult/devil/devil/android/crash_handler.py
 ../../third_party/catapult/devil/devil/android/decorators.py
 ../../third_party/catapult/devil/devil/android/device_blacklist.py
+../../third_party/catapult/devil/devil/android/device_denylist.py
 ../../third_party/catapult/devil/devil/android/device_errors.py
 ../../third_party/catapult/devil/devil/android/device_list.py
 ../../third_party/catapult/devil/devil/android/device_signal.py

testing/scripts/run_android_wpt.pydeps

@@ -88,7 +88,7 @@
 //third_party/catapult/devil/devil/android/constants/chrome.py
 //third_party/catapult/devil/devil/android/constants/file_system.py
 //third_party/catapult/devil/devil/android/decorators.py
-//third_party/catapult/devil/devil/android/device_blacklist.py
+//third_party/catapult/devil/devil/android/device_denylist.py
 //third_party/catapult/devil/devil/android/device_errors.py
 //third_party/catapult/devil/devil/android/device_signal.py
 //third_party/catapult/devil/devil/android/device_temp_file.py

tools/run-swarmed.py

@@ -92,22 +92,28 @@ def _Spawn(args):
   if args.device_os:
     trigger_args += ['-d', 'device_os=' + args.device_os]
 
+  runner_args = []
   if not args.no_test_flags:
     # These flags are recognized by our test runners, but do not work
     # when running custom scripts.
-    trigger_args += [
+    runner_args += [
         '--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json',
         '--system-log-file=${ISOLATED_OUTDIR}/system_log'
     ]
   if args.gtest_filter:
-    trigger_args.append('--gtest_filter=' + args.gtest_filter)
+    runner_args.append('--gtest_filter=' + args.gtest_filter)
   if args.repeat:
-    trigger_args.append('--repeat=' + args.repeat)
+    runner_args.append('--repeat=' + args.repeat)
   elif args.target_os == 'fuchsia':
     filter_file = \
         'testing/buildbot/filters/fuchsia.' + args.target_name + '.filter'
     if os.path.isfile(filter_file):
-      trigger_args.append('--test-launcher-filter-file=../../' + filter_file)
+      runner_args.append('--test-launcher-filter-file=../../' + filter_file)
+
+  if runner_args:
+    trigger_args.append('--')
+    trigger_args.extend(runner_args)
+
   with open(os.devnull, 'w') as nul:
     subprocess.check_call(trigger_args, stdout=nul)
   return (index, json_file, args)