Bug 1316875 - Fix page-worker SDK test addon intermittency and re-ena…

…ble it. r=mossop

MozReview-Commit-ID: 94ImlSy0dU8

--HG--
extra : rebase_source : 3e20c6617d96e8da99f43723ac65bb6f0c23ac2b

addon-sdk/source/lib/sdk/content/page-worker.js

@@ -13,8 +13,7 @@ const { Rules } = require('../util/rules');
 const { uuid } = require('../util/uuid');
 const { WorkerChild } = require("./worker-child");
 const { Cc, Ci, Cu } = require("chrome");
-const { observe } = require("../event/chrome");
-const { on } = require("../event/core");
+const { on: onSystemEvent } = require("../system/events");
 
 const appShell = Cc["@mozilla.org/appshell/appShellService;1"].getService(Ci.nsIAppShellService);
 
@@ -96,6 +95,7 @@ const ChildPage = Class({
     this.options.contentURL = url;
 
     url = this.options.contentURL ? data.url(this.options.contentURL) : "about:blank";
+
     this.webNav.loadURI(url, Ci.nsIWebNavigation.LOAD_FLAGS_NONE, null, null, null);
   },
 
@@ -121,14 +121,15 @@ const ChildPage = Class({
   QueryInterface: XPCOMUtils.generateQI(["nsIWebProgressListener", "nsISupportsWeakReference"])
 });
 
-on(observe(DOC_INSERTED), "data", ({ target }) => {
-  let page = Array.from(pages.values()).find(p => p.contentWindow.document === target);
+onSystemEvent(DOC_INSERTED, ({type, subject, data}) => {
+  let page = Array.from(pages.values()).find(p => p.contentWindow.document === subject);
+
   if (!page)
     return;
 
   if (getAttachEventType(page.options) == DOC_INSERTED)
     page.attachWorker();
-});
+}, true);
 
 frames.port.on("sdk/frame/create", (frame, id, options) => {
   new ChildPage(frame, id, options);

addon-sdk/source/test/addons/jetpack-addon.ini

@@ -29,7 +29,6 @@ skip-if = true
 [page-mod-debugger-post.xpi]
 [page-mod-debugger-pre.xpi]
 [page-worker.xpi]
-skip-if = true # Bug 1288619 and Bug 1288708
 [places.xpi]
 [predefined-id-with-at.xpi]
 [preferences-branch.xpi]