[blink][android] Fix --adb-device in the layout test runner.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android.py

 # Copyright (C) 2012 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 316 matching lines @@
         return [int(n) for n in result.group(1).split('.')]
 
 
 # A class to encapsulate device status and information, such as the AndroidCommands
 # instances and whether the device has been set up.
 class AndroidDevices(object):
     # Percentage of battery a device needs to have in order for it to be considered
     # to participate in running the layout tests.
     MINIMUM_BATTERY_PERCENTAGE = 30
 
-    def __init__(self, executive, default_device=None, debug_logging=False):
+    def __init__(self, default_devices=None, debug_logging=False):
         self._usable_devices = []
-        self._default_device = default_device
+        self._default_devices = default_devices
         self._prepared_devices = []
         self._debug_logging = debug_logging
 
     def prepared_devices(self):
         return self._prepared_devices
 
     def usable_devices(self, executive):
         if self._usable_devices:
             return self._usable_devices
 
-        if self._default_device:
-            self._usable_devices = [AndroidCommands(executive, self._default_device, self._debug_logging)]
+        if self._default_devices:
+            self._usable_devices = [
+                AndroidCommands(executive, d, self._debug_logging)
+                for d in self._default_devices]
             return self._usable_devices
 
         # Example "adb devices" command output:
         #   List of devices attached
         #   0123456789ABCDEF        device
         re_device = re.compile('^([a-zA-Z0-9_:.-]+)\tdevice$', re.MULTILINE)
 
         result = executive.run_command([AndroidCommands.adb_command_path(executive, debug_logging=self._debug_logging), 'devices'],
                                        error_handler=executive.ignore_error, debug_logging=self._debug_logging)
         devices = re_device.findall(result)
@@ skipping 68 matching lines @@
 
         if not self.get_option('disable_breakpad'):
             self._dump_reader = DumpReaderAndroid(host, self._build_path())
 
         if self.driver_name() != self.CONTENT_SHELL_NAME:
             raise AssertionError('Layout tests on Android only support content_shell as the driver.')
 
         self._driver_details = ContentShellDriverDetails()
 
         # Initialize the AndroidDevices class which tracks available devices.
-        default_device = None
-        if hasattr(self._options, 'adb_device') and len(self._options.adb_device):
-            default_device = self._options.adb_device
+        default_devices = None
+        if hasattr(self._options, 'adb_devices') and len(self._options.adb_devices):
+            default_devices = self._options.adb_devices
 
         self._debug_logging = self.get_option('android_logging')
-        self._devices = AndroidDevices(self._executive, default_device, self._debug_logging)
+        self._devices = AndroidDevices(default_devices, self._debug_logging)
 
         # Tell AndroidCommands where to search for the "adb" command.
         AndroidCommands.set_adb_command_path_options(['adb',
                                                       self.path_from_chromium_base('third_party', 'android_tools', 'sdk', 'platform-tools', 'adb')])
 
         prepared_devices = self.get_option('prepared_devices', [])
         for serial in prepared_devices:
             self._devices.set_device_prepared(serial)
 
     def default_smoke_test_only(self):
@@ skipping 849 matching lines @@
         return command
 
     def _read_prompt(self, deadline):
         last_char = ''
         while True:
             current_char = self._server_process.read_stdout(deadline, 1)
             if current_char == ' ':
                 if last_char in ('#', '$'):
                     return
             last_char = current_char