diff -r 000000000000 -r 6474c204b198 js/xpconnect/tests/unit/test_exportFunction.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/xpconnect/tests/unit/test_exportFunction.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,113 @@
+function run_test() {
+  var Cu = Components.utils;
+  var epsb = new Cu.Sandbox(["http://example.com", "http://example.org"], { wantExportHelpers: true });
+  var subsb = new Cu.Sandbox("http://example.com", { wantGlobalProperties: ["XMLHttpRequest"] });
+  var subsb2 = new Cu.Sandbox("http://example.com", { wantGlobalProperties: ["XMLHttpRequest"] });
+  var xorigsb = new Cu.Sandbox("http://test.com");
+
+  epsb.subsb = subsb;
+  epsb.xorigsb = xorigsb;
+  epsb.do_check_true = do_check_true;
+  epsb.do_check_eq = do_check_eq;
+  epsb.do_check_neq = do_check_neq;
+
+  // Exporting should work if prinicipal of the source sandbox
+  // subsumes the principal of the target sandbox.
+  Cu.evalInSandbox("(" + function() {
+    Object.prototype.protoProp = "common";
+    var wasCalled = false;
+    var _this = this;
+    this.funToExport = function(a, obj, native, mixed) {
+      do_check_eq(a, 42);
+      do_check_neq(obj, subsb.tobecloned);
+      do_check_eq(obj.cloned, "cloned");
+      do_check_eq(obj.protoProp, "common");
+      do_check_eq(native, subsb.native);
+      do_check_eq(_this, this);
+      do_check_eq(mixed.xrayed, subsb.xrayed);
+      do_check_eq(mixed.xrayed2, subsb.xrayed2);
+      wasCalled = true;
+    };
+    this.checkIfCalled = function() {
+      do_check_true(wasCalled);
+      wasCalled = false;
+    }
+    exportFunction(funToExport, subsb, { defineAs: "imported" });
+  }.toSource() + ")()", epsb);
+
+  subsb.xrayed = Cu.evalInSandbox("(" + function () {
+      return new XMLHttpRequest();
+  }.toSource() + ")()", subsb2);
+
+  // Exported function should be able to be call from the
+  // target sandbox. Native arguments should be just wrapped
+  // every other argument should be cloned.
+  Cu.evalInSandbox("(" + function () {
+    native = new XMLHttpRequest();
+    xrayed2 = XPCNativeWrapper(new XMLHttpRequest());
+    mixed = { xrayed: xrayed, xrayed2: xrayed2 };
+    tobecloned = { cloned: "cloned" };
+    imported(42,tobecloned, native, mixed);
+  }.toSource() + ")()", subsb);
+
+  // Apply should work but the |this| argument should not be
+  // possible to be changed.
+  Cu.evalInSandbox("(" + function() {
+    imported.apply("something", [42, tobecloned, native, mixed]);
+  }.toSource() + ")()", subsb);
+
+  Cu.evalInSandbox("(" + function() {
+    checkIfCalled();
+  }.toSource() + ")()", epsb);
+
+  // Exporting should throw if princpal of the source sandbox does
+  // not subsume the principal of the target.
+  Cu.evalInSandbox("(" + function() {
+    try{
+      exportFunction(function() {}, this.xorigsb, { defineAs: "denied" });
+      do_check_true(false);
+    } catch (e) {
+      do_check_true(e.toString().indexOf('Permission denied') > -1);
+    }
+  }.toSource() + ")()", epsb);
+
+  // Let's create an object in the target scope and add privileged
+  // function to it as a property.
+  Cu.evalInSandbox("(" + function() {
+    var newContentObject = createObjectIn(subsb, { defineAs: "importedObject" });
+    exportFunction(funToExport, newContentObject, { defineAs: "privMethod" });
+  }.toSource() + ")()", epsb);
+
+  Cu.evalInSandbox("(" + function () {
+    importedObject.privMethod(42, tobecloned, native, mixed);
+  }.toSource() + ")()", subsb);
+
+  Cu.evalInSandbox("(" + function() {
+    checkIfCalled();
+  }.toSource() + ")()", epsb);
+
+  // exportFunction and createObjectIn should be available from Cu too.
+  var newContentObject = Cu.createObjectIn(subsb, { defineAs: "importedObject2" });
+  var wasCalled = false;
+  Cu.exportFunction(function(arg) { wasCalled = arg.wasCalled; },
+                    newContentObject, { defineAs: "privMethod" });
+
+  Cu.evalInSandbox("(" + function () {
+    importedObject2.privMethod({wasCalled: true});
+  }.toSource() + ")()", subsb);
+
+  // 3rd argument of exportFunction should be optional.
+  Cu.evalInSandbox("(" + function() {
+    subsb.imported2 = exportFunction(funToExport, subsb);
+  }.toSource() + ")()", epsb);
+
+  Cu.evalInSandbox("(" + function () {
+    imported2(42, tobecloned, native, mixed);
+  }.toSource() + ")()", subsb);
+
+  Cu.evalInSandbox("(" + function() {
+    checkIfCalled();
+  }.toSource() + ")()", epsb);
+
+  do_check_true(wasCalled, true);
+}