Bug 1768074 - Stop using the second argument to ChromeUtils.import in startup marionette tests. r=mossop

Differential Revision: https://phabricator.services.mozilla.com/D145658

toolkit/xre/test/marionette/test_fission_autostart.py

@@ -133,7 +133,8 @@ class TestFissionAutostart(MarionetteTestCase):
           // We're running in a function, in a sandbox, that inherits from an
           // X-ray wrapped window. Anything we want to be globally available
           // needs to be defined on that window.
-          ChromeUtils.import("resource://gre/modules/Services.jsm", window);
+          let { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+          window.Services = Services;
           window.env = Cc["@mozilla.org/process/environment;1"]
                     .getService(Ci.nsIEnvironment);
         """

toolkit/xre/test/marionette/test_win32k_enrollment.py

@@ -141,7 +141,8 @@ class TestWin32kAutostart(MarionetteTestCase):
           // We're running in a function, in a sandbox, that inherits from an
           // X-ray wrapped window. Anything we want to be globally available
           // needs to be defined on that window.
-          ChromeUtils.import("resource://gre/modules/Services.jsm", window);
+          let { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+          window.Services = Services;
           window.env = Cc["@mozilla.org/process/environment;1"]
                     .getService(Ci.nsIEnvironment);
         """

toolkit/xre/test/marionette/test_win32k_enrollment.template.py

@@ -141,7 +141,8 @@ class TestWin32kAutostart(MarionetteTestCase):
           // We're running in a function, in a sandbox, that inherits from an
           // X-ray wrapped window. Anything we want to be globally available
           // needs to be defined on that window.
-          ChromeUtils.import("resource://gre/modules/Services.jsm", window);
+          let { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+          window.Services = Services;
           window.env = Cc["@mozilla.org/process/environment;1"]
                     .getService(Ci.nsIEnvironment);
         """