Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Unified Diff: tools/telemetry/telemetry/desktop_browser_backend.py

Issue 11412238: Proof of concept for running extension API stack through dev tools. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/telemetry/telemetry/desktop_browser_backend.py
diff --git a/tools/telemetry/telemetry/desktop_browser_backend.py b/tools/telemetry/telemetry/desktop_browser_backend.py
index 43ac0b5c1588aa830486a146afd33c6a873e14d1..9797e7bad15e764bfc64bf14c4e362870849e2b8 100644
--- a/tools/telemetry/telemetry/desktop_browser_backend.py
+++ b/tools/telemetry/telemetry/desktop_browser_backend.py
@@ -27,6 +27,9 @@ class DesktopBrowserBackend(browser_backend.BrowserBackend):
if not self._executable:
raise Exception('Cannot create browser, no executable found!')
+ if len(options.extensions_to_load) > 0 and is_content_shell:
+ raise Exception('Cannot load extensions for content shell!')
+
self._port = DEFAULT_PORT
args = [self._executable]
args.extend(self.GetBrowserStartupArgs())
@@ -52,6 +55,17 @@ class DesktopBrowserBackend(browser_backend.BrowserBackend):
if not self.options.dont_override_profile:
self._tmpdir = tempfile.mkdtemp()
args.append('--user-data-dir=%s' % self._tmpdir)
+ extensions = ','.join(
+ [extension.path for extension in self.options.extensions_to_load
+ if not extension.is_component])
+ component_extensions = ','.join(
+ [extension.path for extension in self.options.extensions_to_load
+ if extension.is_component])
+ if len(extensions) > 0:
+ args.append('--load-extension=%s' % extensions)
+ if len(component_extensions) > 0:
+ args.append('--load-component-extension=%s' % component_extensions)
+
return args
def IsBrowserRunning(self):
« no previous file with comments | « tools/telemetry/telemetry/cros_browser_finder.py ('k') | tools/telemetry/telemetry/desktop_browser_finder.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698