Telemetry --device

tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py

Index: tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py
diff --git a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py b/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py
index ea432b5a030582419038ce862edf5ba9bb1aac1b..b07ed56df423c993ef6284deb1cff2f02d87b98c 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py
@@ -145,48 +145,19 @@ def SelectDefaultBrowser(possible_browsers):
   return max(possible_browsers, key=lambda b: b.last_modification_time())
 
 
-def CanFindAvailableBrowsers():
-  if not adb_commands.IsAndroidSupported():
-    logging.info('Android build commands unavailable on this machine. Have '
-                 'you installed Android build dependencies?')
-    return False
-
-  try:
-    with open(os.devnull, 'w') as devnull:
-      proc = subprocess.Popen(
-          ['adb', 'devices'],
-          stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=devnull)
-      stdout, _ = proc.communicate()
-    if re.search(re.escape('????????????\tno permissions'), stdout) != None:
-      logging.warn('adb devices reported a permissions error. Consider '
-                   'restarting adb as root:')
-      logging.warn('  adb kill-server')
-      logging.warn('  sudo `which adb` devices\n\n')
-    return True
-  except OSError:
-    platform_tools_path = os.path.join(util.GetChromiumSrcDir(),
-        'third_party', 'android_tools', 'sdk', 'platform-tools')
-    if (sys.platform.startswith('linux') and
-        os.path.exists(os.path.join(platform_tools_path, 'adb'))):
-      os.environ['PATH'] = os.pathsep.join([platform_tools_path,
-                                            os.environ['PATH']])
-      return True
-  return False
-
-
 def FindAllBrowserTypes(_options):
   return CHROME_PACKAGE_NAMES.keys()
 
 
 def FindAllAvailableBrowsers(finder_options):
   """Finds all the desktop browsers available on this machine."""
-  if not CanFindAvailableBrowsers():
+  if not android_device.CanFindAvailableDevices():
     logging.info('No adb command found. ' +
                  'Will not try searching for Android browsers.')
     return []
-  if finder_options.android_device:
+  if finder_options.device and finder_options.device != 'list':
     devices = [android_device.AndroidDevice(
-        finder_options.android_device,
+        finder_options.device,
         enable_performance_mode=not finder_options.no_performance_mode)]
   else:
     devices = android_device.AndroidDevice.GetAllConnectedDevices()