Chromium Code Reviews| Index: tools/telemetry/telemetry/desktop_browser_backend.py |
| =================================================================== |
| --- tools/telemetry/telemetry/desktop_browser_backend.py (revision 179975) |
| +++ tools/telemetry/telemetry/desktop_browser_backend.py (working copy) |
| @@ -25,6 +25,9 @@ |
| 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 = util.GetAvailableLocalPort() |
| args = [self._executable] |
| @@ -51,6 +54,17 @@ |
| if not self.options.dont_override_profile: |
| self._tmpdir = tempfile.mkdtemp() |
| args.append('--user-data-dir=%s' % self._tmpdir) |
| + extensions = ','.join( |
|
nduca
2013/02/01 00:25:50
we should verify that the extension exists before
achuithb
2013/02/06 00:23:03
Done.
|
| + [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): |