Bug 1044556 - Part 2 - Move promiseTabEvent to head.js. r=sebastian
MozReview-Commit-ID: 5sLe2nl4v2u
--- a/mobile/android/tests/browser/chrome/head.js
+++ b/mobile/android/tests/browser/chrome/head.js
@@ -14,16 +14,29 @@ function promiseBrowserEvent(browser, ev
resolve(event);
}
browser.addEventListener(eventType, handle, true);
info("Now waiting for " + eventType + " event from browser");
});
}
+function promiseTabEvent(container, eventType) {
+ return new Promise((resolve) => {
+ function handle(event) {
+ info("Received event " + eventType + " from container");
+ container.removeEventListener(eventType, handle, true);
+ resolve(event);
+ }
+
+ container.addEventListener(eventType, handle, true);
+ info("Now waiting for " + eventType + " event from container");
+ });
+}
+
function promiseNotification(topic) {
Cu.import("resource://gre/modules/Services.jsm");
return new Promise((resolve, reject) => {
function observe(subject, topic, data) {
info("Received " + topic + " notification from Gecko");
Services.obs.removeObserver(observe, topic);
resolve();
--- a/mobile/android/tests/browser/chrome/test_selectoraddtab.html
+++ b/mobile/android/tests/browser/chrome/test_selectoraddtab.html
@@ -16,29 +16,16 @@ https://bugzilla.mozilla.org/show_bug.cg
"use strict";
const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/Messaging.jsm");
Cu.import("resource://gre/modules/Task.jsm");
- function promiseTabEvent(container, eventType) {
- return new Promise((resolve) => {
- function handle(event) {
- info("Received event " + eventType + " from container");
- container.removeEventListener(eventType, handle, true);
- resolve(event);
- }
-
- container.addEventListener(eventType, handle, true);
- info("Now waiting for " + eventType + " event from container");
- });
- }
-
// The chrome window
let chromeWin;
// Track the <browser>s where the tests are happening
let browserBlank;
let browserTest;
const kTestPage = "http://mochi.test:8888/chrome/mobile/android/tests/browser/chrome/basic_article.html";