[polymer] Merge of master into polymer10-migration

devil/devil/utils/find_usb_devices.py

Index: devil/devil/utils/find_usb_devices.py
diff --git a/devil/devil/utils/find_usb_devices.py b/devil/devil/utils/find_usb_devices.py
index abf8cb3387a569436398ded1c3433c747cee4043..5d012f572406cd103885b60e0d6da38488780cf1 100755
--- a/devil/devil/utils/find_usb_devices.py
+++ b/devil/devil/utils/find_usb_devices.py
@@ -348,6 +348,7 @@ def GetPhysicalPortToBusDeviceMap(hub, hub_type):
 
 def GetPhysicalPortToSerialMap(hub, hub_type):
   """Gets physical-port:serial# mapping for a given hub.
+
   Args:
     hub: [USBNode] Hub to get map for.
     hub_type: [usb_hubs.HubType] Which type of hub it is.
@@ -488,15 +489,17 @@ def TestUSBTopologyScript():
 
   # Display TTY information about devices plugged into hubs.
   print '==== TTY INFORMATION ===='
-  for port_map in GetAllPhysicalPortToTTYMaps([usb_hubs.PLUGABLE_7PORT],
-                                              device_tree_map=device_trees):
+  for port_map in GetAllPhysicalPortToTTYMaps([usb_hubs.PLUGABLE_7PORT,
+      usb_hubs.PLUGABLE_7PORT_USB3_PART2, usb_hubs.PLUGABLE_7PORT_USB3_PART3],
+      device_tree_map=device_trees):
     print port_map
   print
 
   # Display serial number information about devices plugged into hubs.
   print '==== SERIAL NUMBER INFORMATION ===='
-  for port_map in GetAllPhysicalPortToSerialMaps([usb_hubs.PLUGABLE_7PORT],
-                                                 device_tree_map=device_trees):
+  for port_map in GetAllPhysicalPortToSerialMaps([usb_hubs.PLUGABLE_7PORT,
+      usb_hubs.PLUGABLE_7PORT_USB3_PART2, usb_hubs.PLUGABLE_7PORT_USB3_PART3],
+      device_tree_map=device_trees):
     print port_map