bug 834961: no longer prevent opening of private windows in window/ut…

…ils, it is prevented in high level windows module still however. Also fixing issues using the loader in test/private-browsing/helper

lib/sdk/window/utils.js

@@ -151,8 +151,6 @@ function open(uri, options) {
                serializeFeatures(options.features || {}),
                options.args || null);
 
-  if (ignoreWindow(newWindow))
-    return undefined;
   return newWindow;
 }
 exports.open = open;
@@ -234,8 +232,6 @@ function openDialog(options) {
       ])
   );
 
-  if (ignoreWindow(newWindow))
-    return undefined;
   return newWindow;
 }
 exports.openDialog = openDialog;

test/private-browsing/helper.js

@@ -26,8 +26,16 @@ require('sdk/private-browsing/window/utils');
 
 function PBLoader(options) {
   options = options || {};
-  let packaging = JSON.parse(JSON.stringify(require("@loader/options")));
-  packaging.metadata = merge(packaging.metadata, options.metadata);
+  let jpOptions = require("@loader/options");
+  let packaging = {
+    metadata: {}
+  };
+
+  shallowClone(jpOptions, packaging);
+  shallowClone(options, packaging);
+
+  shallowClone(jpOptions.metadata || {}, packaging.metadata);
+  shallowClone(options.metadata || {}, packaging.metadata);
 
   let globals = {};
   let errors = [];
@@ -53,6 +61,13 @@ function PBLoader(options) {
   }
 }
 
+function shallowClone(source, target) {
+  for (let prop in source) {
+    if (!(prop in target))
+      target[prop] = source[prop];
+  }
+}
+
 function deactivate(callback) {
   if (pbUtils.isGlobalPBSupported) {
     if (callback)

test/private-browsing/windows.js

@@ -4,12 +4,14 @@
 'use strict';
 
 const { loader, pb, pbUtils } = require('./helper');
-const { openDialog } = loader.require('window/utils');
+const { openDialog, open } = loader.require('window/utils');
 
 const { isPrivate } = require('sdk/private-browsing');
 const { browserWindows: windows } = require('sdk/windows');
 
-
+// test openDialog() from window/utils with private option
+// test isActive state in pwpb case
+// test isPrivate on ChromeWindow
 exports.testPerWindowPrivateBrowsingGetter = function(assert, done) {
   let win = openDialog({
     private: true
@@ -20,6 +22,35 @@ exports.testPerWindowPrivateBrowsingGetter = function(assert, done) {
 
     assert.equal(pbUtils.getMode(win),
                  true, 'Newly opened window is in PB mode');
+    assert.ok(isPrivate(win), 'isPrivate(window) is true');
+    assert.equal(pb.isActive, false, 'PB mode is not active');
+
+    win.addEventListener("unload", function onunload() {
+      win.removeEventListener('unload', onload, false);
+      assert.equal(pb.isActive, false, 'PB mode is not active');
+      done();
+    }, false);
+
+    win.close();
+  }, false);
+}
+
+// test open() from window/utils with private feature
+// test isActive state in pwpb case
+// test isPrivate on ChromeWindow
+exports.testPerWindowPrivateBrowsingGetter = function(assert, done) {
+  let win = open('chrome://browser/content/browser.xul', {
+    features: {
+      private: true
+    }
+  });
+
+  win.addEventListener('DOMContentLoaded', function onload() {
+    win.removeEventListener('DOMContentLoaded', onload, false);
+
+    assert.equal(pbUtils.getMode(win),
+                 true, 'Newly opened window is in PB mode');
+    assert.ok(isPrivate(win), 'isPrivate(window) is true');
     assert.equal(pb.isActive, false, 'PB mode is not active');
 
     win.addEventListener("unload", function onunload() {