Telemetry --device

tools/telemetry/telemetry/core/browser_finder.py

Index: tools/telemetry/telemetry/core/browser_finder.py
diff --git a/tools/telemetry/telemetry/core/browser_finder.py b/tools/telemetry/telemetry/core/browser_finder.py
index eb189aff2c161a96f1135a369599e4b3c0054f4d..dab093881fd173402a0ede700cc121d55dc1ffee 100644
--- a/tools/telemetry/telemetry/core/browser_finder.py
+++ b/tools/telemetry/telemetry/core/browser_finder.py
@@ -67,6 +67,13 @@ def FindBrowser(options):
        options.browser_type not in finder.FindAllBrowserTypes(options)):
       continue
     curr_browsers = finder.FindAllAvailableBrowsers(options)
+
+    if options.device:
+      curr_browsers = [browser for browser in curr_browsers
+                       if browser.device_id == options.device]

[nednguyen, 2015/01/07 18:18:09]

This should be *possible_browser* to avoid confusion.

+    if len(curr_browsers) == 0:
+      continue
+
     new_default_browser = finder.SelectDefaultBrowser(curr_browsers)
     if new_default_browser:
       default_browsers.append(new_default_browser)
@@ -125,14 +132,14 @@ def FindBrowser(options):
 
 
 @decorators.Cache
-def GetAllAvailableBrowserTypes(options):
-  """Returns a list of available browser types.
+def GetAllAvailableBrowsers(options):
+  """Returns a list of available browsers.
 
   Args:
     options: A BrowserOptions object.
 
   Returns:
-    A list of browser type strings.
+    A list of browser instances.
 
   Raises:
     BrowserFinderException: Options are improperly set, or an error occurred.
@@ -141,6 +148,23 @@ def GetAllAvailableBrowserTypes(options):
   for finder in BROWSER_FINDERS:
     browsers.extend(finder.FindAllAvailableBrowsers(options))
 
+  return browsers
+
+
+@decorators.Cache
+def GetAllAvailableBrowserTypes(options):
+  """Returns a list of available browser types.
+
+  Args:
+    options: A BrowserOptions object.
+
+  Returns:
+    A list of browser type strings.
+
+  Raises:
+    BrowserFinderException: Options are improperly set, or an error occurred.
+  """
+  browsers = GetAllAvailableBrowsers(options)
   type_list = set([browser.browser_type for browser in browsers])
   type_list = list(type_list)
   type_list.sort()