Index: tools/telemetry/telemetry/desktop_browser_finder.py |
=================================================================== |
--- tools/telemetry/telemetry/desktop_browser_finder.py (revision 182312) |
+++ tools/telemetry/telemetry/desktop_browser_finder.py (working copy) |
@@ -40,6 +40,11 @@ |
backend.SetBrowser(b) |
return b |
+ def SupportsOptions(self, options): |
+ if (len(options.extensions_to_load) != 0) and self._is_content_shell: |
+ return False |
+ return True |
+ |
def FindAllAvailableBrowsers(options): |
"""Finds all the desktop browsers available on this machine.""" |
browsers = [] |
@@ -122,8 +127,7 @@ |
pass |
if found: |
browsers.append( |
- PossibleDesktopBrowser('system', options, |
- 'google-chrome', False)) |
+ PossibleDesktopBrowser('system', options, 'google-chrome', False)) |
# Win32-specific options. |
if sys.platform.startswith('win'): |