From a4b02086a125f5bed6b8d5cc5fefb887bc5865a3 Mon Sep 17 00:00:00 2001 From: Henrik Skupin Date: Wed, 24 May 2017 21:44:04 +0200 Subject: [PATCH] Bug 1223277 - Reorder global JS module imports in listener.js. r=ato Reorder imports so that global ones are done before local imports. MozReview-Commit-ID: 7xA9XQlxlj4 --HG-- extra : rebase_source : b144401c5c6c47e87beab669f76f2b61fb79e5b6 --- testing/marionette/listener.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/testing/marionette/listener.js b/testing/marionette/listener.js index d381a8f320ae..e1f52359d9f6 100644 --- a/testing/marionette/listener.js +++ b/testing/marionette/listener.js @@ -12,6 +12,12 @@ var uuidGen = Cc["@mozilla.org/uuid-generator;1"] var loader = Cc["@mozilla.org/moz/jssubscript-loader;1"] .getService(Ci.mozIJSSubScriptLoader); +Cu.import("resource://gre/modules/FileUtils.jsm"); +Cu.import("resource://gre/modules/Log.jsm"); +Cu.import("resource://gre/modules/Preferences.jsm"); +Cu.import("resource://gre/modules/Task.jsm"); +Cu.import("resource://gre/modules/XPCOMUtils.jsm"); + Cu.import("chrome://marionette/content/accessibility.js"); Cu.import("chrome://marionette/content/action.js"); Cu.import("chrome://marionette/content/atom.js"); @@ -26,11 +32,6 @@ Cu.import("chrome://marionette/content/navigate.js"); Cu.import("chrome://marionette/content/proxy.js"); Cu.import("chrome://marionette/content/session.js"); -Cu.import("resource://gre/modules/FileUtils.jsm"); -Cu.import("resource://gre/modules/Preferences.jsm"); -Cu.import("resource://gre/modules/Task.jsm"); -Cu.import("resource://gre/modules/XPCOMUtils.jsm"); - Cu.importGlobalProperties(["URL"]); var marionetteTestName; @@ -79,7 +80,6 @@ var asyncChrome = proxy.toChromeAsync({ }); var syncChrome = proxy.toChrome(sendSyncMessage.bind(this)); -Cu.import("resource://gre/modules/Log.jsm"); var logger = Log.repository.getLogger("Marionette"); // Append only once to avoid duplicated output after listener.js gets reloaded if (logger.ownAppenders.length == 0) {