Bug 1398739 - Fix Activity Stream related test failure in browser_google_behavior.js.
MozReview-Commit-ID: FjPE8gWWkqe
--- a/browser/components/search/test/browser_google_behavior.js
+++ b/browser/components/search/test/browser_google_behavior.js
@@ -51,16 +51,23 @@ function promiseStateChangeURI() {
gBrowser.addProgressListener(listener);
});
}
function promiseContentSearchReady(browser) {
return ContentTask.spawn(browser, {}, async function(args) {
return new Promise(resolve => {
+ if (content.wrappedJSObject.gContentSearchController) {
+ let searchController = content.wrappedJSObject.gContentSearchController;
+ if (searchController.defaultEngine) {
+ resolve();
+ }
+ }
+
content.addEventListener("ContentSearchService", function listener(aEvent) {
if (aEvent.detail.type == "State") {
content.removeEventListener("ContentSearchService", listener);
resolve();
}
});
});
});