diff options
| author | tengs@chromium.org <tengs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-13 18:41:41 +0000 |
|---|---|---|
| committer | tengs@chromium.org <tengs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-13 18:41:41 +0000 |
| commit | 7331b5299e7d858cdf265161356df715e986f4c8 (patch) | |
| tree | c77b46da15c9e858b9739d5eea85d80fe7a2ae51 /tools/telemetry | |
| parent | cb2b465ba999b4bc18aa2baae363fddc15bb81bd (diff) | |
| download | chromium_src-7331b5299e7d858cdf265161356df715e986f4c8.zip chromium_src-7331b5299e7d858cdf265161356df715e986f4c8.tar.gz chromium_src-7331b5299e7d858cdf265161356df715e986f4c8.tar.bz2 | |
Check for extension readiness when we need it instead of at browser startup.
BUG=224517
TEST=telemetry extension tests pass
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/14787009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199783 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/telemetry')
| -rw-r--r-- | tools/telemetry/telemetry/core/chrome/browser_backend.py | 2 | ||||
| -rw-r--r-- | tools/telemetry/telemetry/core/chrome/extension_dict_backend.py | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/telemetry/telemetry/core/chrome/browser_backend.py b/tools/telemetry/telemetry/core/chrome/browser_backend.py index a191307..afb974c 100644 --- a/tools/telemetry/telemetry/core/chrome/browser_backend.py +++ b/tools/telemetry/telemetry/core/chrome/browser_backend.py @@ -136,8 +136,6 @@ class BrowserBackend(object): for e in self.options.extensions_to_load: if not e.extension_id in self._extension_dict_backend: return False - extension_object = self._extension_dict_backend[e.extension_id] - extension_object.WaitForDocumentReadyStateToBeInteractiveOrBetter() return True if self._supports_extensions: util.WaitFor(AllExtensionsLoaded, timeout=30) diff --git a/tools/telemetry/telemetry/core/chrome/extension_dict_backend.py b/tools/telemetry/telemetry/core/chrome/extension_dict_backend.py index 4b4e2a7..2b39fe2 100644 --- a/tools/telemetry/telemetry/core/chrome/extension_dict_backend.py +++ b/tools/telemetry/telemetry/core/chrome/extension_dict_backend.py @@ -25,6 +25,7 @@ class ExtensionDictBackend(object): extension_object = self._extension_dict.get(extension_id) if not extension_object: extension_object = self._CreateExtensionObject(extension_id) + extension_object.WaitForDocumentReadyStateToBeInteractiveOrBetter() assert extension_object self._extension_dict[extension_id] = extension_object return extension_object |