🐠 Use the new DeviceUtils.HealthyDevices(device_arg=) in a few scripts

build/android/adb_command_line.py

Index: build/android/adb_command_line.py
diff --git a/build/android/adb_command_line.py b/build/android/adb_command_line.py
index c242aa1c0f41ca5c7c4f6a355b190190837fb1a4..72f42b6e61e6872394f385579504f018beb20316 100755
--- a/build/android/adb_command_line.py
+++ b/build/android/adb_command_line.py
@@ -24,8 +24,8 @@ Empty string: Deletes command-line file.
 Otherwise: Writes command-line file.
 
 '''
-  parser.add_argument('-d', '--device', dest='device',
-                      help='Target device for apk to install on.')
+  parser.add_argument('-d', '--device', dest='devices', action='append',
+                      default=[], help='Target device serial (repeatable).')
   parser.add_argument('--device-path', required=True,
                       help='Remote path to flags file.')
   parser.add_argument('-e', '--executable', dest='executable', default='chrome',
@@ -36,13 +36,8 @@ Otherwise: Writes command-line file.
 
   as_root = not args.device_path.startswith('/data/local/tmp/')
 
-  if args.device:
-    devices = [device_utils.DeviceUtils(args.device, default_retries=0)]
-  else:
-    devices = device_utils.DeviceUtils.HealthyDevices(default_retries=0)
-    if not devices:
-      raise device_errors.NoDevicesError()
-
+  devices = device_utils.DeviceUtils.HealthyDevices(device_arg=args.devices,
+                                                    default_retries=0)
   all_devices = device_utils.DeviceUtils.parallel(devices)
 
   def print_args():