From cccb2d341e3ef954cc9f528d76dffed8c78d2a0d Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Thu, 11 Dec 2014 07:47:37 -0800
Subject: [PATCH] Bug 1104623 - Inherit security flags if channel already has a
 loadinfo attached in NS_NewChannel - tests (r=ckerschb)

---
 dom/workers/moz.build                  |  2 +
 dom/workers/test/browser.ini           |  4 ++
 dom/workers/test/browser_bug1104623.js | 51 ++++++++++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 dom/workers/test/browser.ini
 create mode 100644 dom/workers/test/browser_bug1104623.js

diff --git a/dom/workers/moz.build b/dom/workers/moz.build
index 7d3dbb7085c4..dea3ce2f7b6d 100644
--- a/dom/workers/moz.build
+++ b/dom/workers/moz.build
@@ -107,3 +107,5 @@ MOCHITEST_MANIFESTS += [
 MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
 
 XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini']
+
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
diff --git a/dom/workers/test/browser.ini b/dom/workers/test/browser.ini
new file mode 100644
index 000000000000..54fc0dde8487
--- /dev/null
+++ b/dom/workers/test/browser.ini
@@ -0,0 +1,4 @@
+[DEFAULT]
+
+[browser_bug1104623.js]
+run-if = buildapp == 'browser'
diff --git a/dom/workers/test/browser_bug1104623.js b/dom/workers/test/browser_bug1104623.js
new file mode 100644
index 000000000000..1ff0bbd80015
--- /dev/null
+++ b/dom/workers/test/browser_bug1104623.js
@@ -0,0 +1,51 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+function whenBrowserLoaded(aBrowser, aCallback) {
+  aBrowser.addEventListener("load", function onLoad(event) {
+    if (event.target == aBrowser.contentDocument) {
+      aBrowser.removeEventListener("load", onLoad, true);
+      executeSoon(aCallback);
+    }
+  }, true);
+}
+
+function test() {
+  waitForExplicitFinish();
+
+  let testURL = "chrome://mochitests/content/chrome/dom/base/test/file_empty.html";
+
+  let tab = gBrowser.addTab(testURL);
+  gBrowser.selectedTab = tab;
+
+  whenBrowserLoaded(tab.linkedBrowser, function() {
+    let doc = tab.linkedBrowser.contentDocument;
+    let contentWin = tab.linkedBrowser.contentWindow;
+
+    let blob = new contentWin.Blob(['onmessage = function() { postMessage(true); }']);
+    ok(blob, "Blob has been created");
+
+    let blobURL = contentWin.URL.createObjectURL(blob);
+    ok(blobURL, "Blob URL has been created");
+
+    let worker = new contentWin.Worker(blobURL);
+    ok(worker, "Worker has been created");
+
+    worker.onerror = function(error) {
+      ok(false, "Worker.onerror:" + error.message);
+      contentWin.URL.revokeObjectURL(blob);
+      gBrowser.removeTab(tab);
+      executeSoon(finish);
+    }
+
+    worker.onmessage = function() {
+      ok(true, "Worker.onmessage");
+      contentWin.URL.revokeObjectURL(blob);
+      gBrowser.removeTab(tab);
+      executeSoon(finish);
+    }
+
+    worker.postMessage(true);
+  });
+}