diff --git a/testing/marionette/actors/MarionetteFrameChild.jsm b/testing/marionette/actors/MarionetteFrameChild.jsm index 6a8c8537ed56..2ed2f30d7581 100644 --- a/testing/marionette/actors/MarionetteFrameChild.jsm +++ b/testing/marionette/actors/MarionetteFrameChild.jsm @@ -10,14 +10,12 @@ const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { element } = ChromeUtils.import( - "chrome://marionette/content/element.js" -); -const { error } = ChromeUtils.import("chrome://marionette/content/error.js"); -const { evaluate } = ChromeUtils.import( - "chrome://marionette/content/evaluate.js" -); -const { Log } = ChromeUtils.import("chrome://marionette/content/log.js"); +XPCOMUtils.defineLazyModuleGetters(this, { + element: "chrome://marionette/content/element.js", + error: "chrome://marionette/content/error.js", + evaluate: "chrome://marionette/content/evaluate.js", + Log: "chrome://marionette/content/log.js", +}); XPCOMUtils.defineLazyGetter(this, "logger", Log.get); diff --git a/testing/marionette/actors/MarionetteFrameParent.jsm b/testing/marionette/actors/MarionetteFrameParent.jsm index c6c48fa20837..5f95b5dc4359 100644 --- a/testing/marionette/actors/MarionetteFrameParent.jsm +++ b/testing/marionette/actors/MarionetteFrameParent.jsm @@ -10,15 +10,13 @@ const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { EventEmitter } = ChromeUtils.import( - "resource://gre/modules/EventEmitter.jsm" -); +XPCOMUtils.defineLazyModuleGetters(this, { + EventEmitter: "resource://gre/modules/EventEmitter.jsm", -const { error } = ChromeUtils.import("chrome://marionette/content/error.js"); -const { evaluate } = ChromeUtils.import( - "chrome://marionette/content/evaluate.js" -); -const { Log } = ChromeUtils.import("chrome://marionette/content/log.js"); + error: "chrome://marionette/content/error.js", + evaluate: "chrome://marionette/content/evaluate.js", + Log: "chrome://marionette/content/log.js", +}); XPCOMUtils.defineLazyGetter(this, "logger", Log.get);