diff options
| author | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 23:14:58 +0000 |
|---|---|---|
| committer | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 23:14:58 +0000 |
| commit | fea7b6805a968d68fdbf9f1ae38acafa2ae32f62 (patch) | |
| tree | f2c328a8c3078e89aecc85525b7ef7f2b3ec3e15 | |
| parent | db762bc76b598c0f3c2e1edb2bd49209db5af409 (diff) | |
| download | chromium_src-fea7b6805a968d68fdbf9f1ae38acafa2ae32f62.zip chromium_src-fea7b6805a968d68fdbf9f1ae38acafa2ae32f62.tar.gz chromium_src-fea7b6805a968d68fdbf9f1ae38acafa2ae32f62.tar.bz2 | |
Extensions not supported in guest mode.
BUG=252074
TEST=run_tests --browser=system-guest ExtensionTest
NOTRY=True
R=hartmanng@chromium.org, nduca@chromium.org
Review URL: https://codereview.chromium.org/17449019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207631 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | tools/telemetry/telemetry/core/chrome/cros_browser_backend.py | 12 | ||||
| -rw-r--r-- | tools/telemetry/telemetry/core/chrome/cros_browser_finder.py | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py b/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py index 2042a9e..c4c4e5c 100644 --- a/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py +++ b/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py @@ -19,7 +19,7 @@ class CrOSBrowserBackend(browser_backend.BrowserBackend): def __init__(self, browser_type, options, cri, is_guest): super(CrOSBrowserBackend, self).__init__(is_content_shell=False, - supports_extensions=True, options=options) + supports_extensions=not is_guest, options=options) # Initialize fields so that an explosion during init doesn't break in Close. self._browser_type = browser_type self._options = options @@ -129,13 +129,13 @@ class CrOSBrowserBackend(browser_backend.BrowserBackend): args = super(CrOSBrowserBackend, self).GetBrowserStartupArgs() args.extend([ - '--enable-smooth-scrolling', - '--enable-threaded-compositing', - '--enable-per-tile-painting', - '--force-compositing-mode', + #'--enable-smooth-scrolling', + #'--enable-threaded-compositing', + #'--enable-per-tile-painting', + #'--force-compositing-mode', # Disables the start page, as well as other external apps that can # steal focus or make measurements inconsistent. - '--disable-default-apps', + #'--disable-default-apps', # Jump to the login screen, skipping network selection, eula, etc. '--login-screen=login', # Allow devtools to connect to chrome. diff --git a/tools/telemetry/telemetry/core/chrome/cros_browser_finder.py b/tools/telemetry/telemetry/core/chrome/cros_browser_finder.py index 16b6926..1bbe4d3 100644 --- a/tools/telemetry/telemetry/core/chrome/cros_browser_finder.py +++ b/tools/telemetry/telemetry/core/chrome/cros_browser_finder.py @@ -42,6 +42,8 @@ class PossibleCrOSBrowser(possible_browser.PossibleBrowser): return b def SupportsOptions(self, options): + if (len(options.extensions_to_load) != 0) and self._is_guest: + return False return True def FindAllAvailableBrowsers(options): |