Bug 1434737 - Move to ChromeUtils.import() - Mozmill Sandbox changes. r=aceman

MozReview-Commit-ID: Ka4GZ09sYPw

calendar/test/mozmill/Makefile.in

@@ -44,7 +44,7 @@ mozmill-stage: $(MOZMILL_SHARED)
 mozmill: mozmill-stage
 	unset PYTHONHOME && cd $(MOZMILLDIR) && unset MACOSX_DEPLOYMENT_TARGET && \
 	$(MOZMILLPYTHON) runtestlist.py --list=$(srcdir)/mozmilltests.list \
-	--binary=$(MOZMILLPROGRAM) \
+	--binary="$(MOZMILLPROGRAM)" \
 	--dir=$(abspath $(MOZMILLDIR))/stage \
 	--symbols-path=$(ABS_DIST)/crashreporter-symbols \
 	--plugins-path=$(ABS_DIST)/plugins \
@@ -55,7 +55,7 @@ mozmill-one: mozmill-stage
 	unset PYTHONHOME && cd $(MOZMILLDIR) && unset MACOSX_DEPLOYMENT_TARGET && \
 	$(MOZMILLPYTHON) runtest.py \
 	--test=$(abspath $(MOZMILLDIR))/stage/$(solo-test) \
-	--binary=$(MOZMILLPROGRAM) \
+	--binary="$(MOZMILLPROGRAM)" \
 	--symbols-path=$(ABS_DIST)/crashreporter-symbols \
 	--plugins-path=$(ABS_DIST)/plugins \
 	$(MOZMILL_EXTRA)

mail/test/resources/jsbridge/jsbridge/extension/resource/modules/server.js

@@ -203,7 +203,7 @@ var backstage = this;
 
 function Session (transport) {
   this.transpart = transport;  // XXX Unused, needed to hold reference? Note the typo.
-  this.sandbox = Components.utils.Sandbox(backstage);
+  this.sandbox = Components.utils.Sandbox(backstage, { wantGlobalProperties: ["ChromeUtils"] });
   this.sandbox.bridge = new Bridge(this);
   this.sandbox.openPreferences = hwindow.openPreferences;
   try {

mail/test/resources/mozmill/mozmill/extension/resource/modules/frame.js

@@ -96,7 +96,7 @@ var loadFile = function(path, collector) {
   file.initWithPath(path);
   var uri = ios.newFileURI(file).spec;
 
-  var module = new Components.utils.Sandbox(systemPrincipal);
+  var module = new Components.utils.Sandbox(systemPrincipal, { wantGlobalProperties: ["ChromeUtils"] });
   module.registeredFunctions = registeredFunctions;
   module.collector = collector
   loadTestResources();

mail/test/resources/mozmill/mozmill/extension/resource/stdlib/securable-module.js

@@ -127,7 +127,7 @@
                                         this._defaultPrincipal);
 
        return {
-         _sandbox: new Cu.Sandbox(principal),
+         _sandbox: new Cu.Sandbox(principal, { wantGlobalProperties: ["ChromeUtils"] }),
          _principal: principal,
          get globalScope() {
            return this._sandbox;