Telemetry --device

tools/telemetry/telemetry/core/backends/remote/trybot_browser_finder.py

Index: tools/telemetry/telemetry/core/backends/remote/trybot_browser_finder.py
diff --git a/tools/telemetry/telemetry/core/backends/remote/trybot_browser_finder.py b/tools/telemetry/telemetry/core/backends/remote/trybot_browser_finder.py
index 2e240c9e43366425c1d6fbbf1c108e892c25729d..ea7143ca5b0ca9b10a14349d407aea227612221c 100644
--- a/tools/telemetry/telemetry/core/backends/remote/trybot_browser_finder.py
+++ b/tools/telemetry/telemetry/core/backends/remote/trybot_browser_finder.py
@@ -15,12 +15,14 @@ import urllib2
 from telemetry import decorators
 from telemetry.core import platform
 from telemetry.core import possible_browser
+from telemetry.core.platform import trybot_device
 
 CHROMIUM_CONFIG_FILENAME = 'tools/run-perf-test.cfg'
 BLINK_CONFIG_FILENAME = 'Tools/run-perf-test.cfg'
 SUCCESS, NO_CHANGES, ERROR = range(3)
 
 
+
 class PossibleTrybotBrowser(possible_browser.PossibleBrowser):
   """A script that sends a job to a trybot."""
 
@@ -34,7 +36,7 @@ class PossibleTrybotBrowser(possible_browser.PossibleBrowser):
     raise NotImplementedError()
 
   def SupportsOptions(self, finder_options):
-    if (finder_options.android_device or
+    if ((finder_options.device and finder_options.device != 'trybot') or
         finder_options.chrome_root or
         finder_options.cros_remote or
         finder_options.extensions_to_load or
@@ -250,7 +252,10 @@ def FindAllBrowserTypes(finder_options):
   return []
 
 
-def FindAllAvailableBrowsers(finder_options):
+def FindAllAvailableBrowsers(finder_options, device):
   """Find all perf trybots on tryserver.chromium.perf."""
+  if not isinstance(device, trybot_device.TrybotDevice):
+    return []
+
   return [PossibleTrybotBrowser(b, finder_options) for b in
           FindAllBrowserTypes(finder_options)]