From 0cf21c41e96d81cfa143b7da96a9959f8e4c4abf Mon Sep 17 00:00:00 2001 From: Ed Lee Date: Fri, 8 Jun 2018 11:34:17 -0700 Subject: [PATCH] chore(mc): Port Bug 1464548: Part 3 - Update callers to use defineLazyGlobalGetters. r=mccr8 Switched to warning eslint no-undef because https://hg.mozilla.org/mozilla-central/rev/a6e7bfa38103 will be available in something newer than 0.13.1. --- .eslintrc.js | 2 ++ bootstrap.js | 2 +- lib/ASRouter.jsm | 3 ++- lib/AboutPreferences.jsm | 4 +++- lib/DownloadsManager.jsm | 3 ++- lib/FaviconFeed.jsm | 2 +- lib/ShortURL.jsm | 2 +- lib/TippyTopProvider.jsm | 4 +++- lib/TopStoriesFeed.jsm | 2 +- ping-centre/PingCentre.jsm | 2 +- test/unit/unit-entry.js | 1 + 11 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 38b6de351c..396e217f7b 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -33,6 +33,8 @@ module.exports = { } }], "rules": { + "no-undef": 1, // Override eslint-plugin-mozilla until 0.13.1+ is available + "promise/catch-or-return": 2, "promise/param-names": 2, diff --git a/bootstrap.js b/bootstrap.js index e9ed456b5c..e1a99c4554 100644 --- a/bootstrap.js +++ b/bootstrap.js @@ -4,7 +4,7 @@ "use strict"; ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); -Cu.importGlobalProperties(["fetch"]); +XPCOMUtils.defineLazyGlobalGetters(this, ["fetch"]); ChromeUtils.defineModuleGetter(this, "Services", "resource://gre/modules/Services.jsm"); diff --git a/lib/ASRouter.jsm b/lib/ASRouter.jsm index 8cc51575e0..7ff0881a5f 100644 --- a/lib/ASRouter.jsm +++ b/lib/ASRouter.jsm @@ -4,7 +4,8 @@ "use strict"; ChromeUtils.import("resource://gre/modules/Services.jsm"); -Cu.importGlobalProperties(["fetch"]); +ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); +XPCOMUtils.defineLazyGlobalGetters(this, ["fetch"]); const {ASRouterActions: ra} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {}); const {OnboardingMessageProvider} = ChromeUtils.import("resource://activity-stream/lib/OnboardingMessageProvider.jsm", {}); diff --git a/lib/AboutPreferences.jsm b/lib/AboutPreferences.jsm index fc6dd251c0..59f225e960 100644 --- a/lib/AboutPreferences.jsm +++ b/lib/AboutPreferences.jsm @@ -3,11 +3,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ "use strict"; -Cu.importGlobalProperties(["fetch"]); ChromeUtils.import("resource://gre/modules/Services.jsm"); +ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); ChromeUtils.defineModuleGetter(this, "PluralForm", "resource://gre/modules/PluralForm.jsm"); const {actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {}); +XPCOMUtils.defineLazyGlobalGetters(this, ["fetch"]); + const PREFERENCES_LOADED_EVENT = "home-pane-loaded"; const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; diff --git a/lib/DownloadsManager.jsm b/lib/DownloadsManager.jsm index b3ec006c89..33b0fb73b2 100644 --- a/lib/DownloadsManager.jsm +++ b/lib/DownloadsManager.jsm @@ -1,5 +1,6 @@ ChromeUtils.import("resource://gre/modules/Services.jsm"); -Cu.importGlobalProperties(["URL"]); +ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); +XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]); const {actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {}); diff --git a/lib/FaviconFeed.jsm b/lib/FaviconFeed.jsm index 4f19f9853e..ad7ddd6edf 100644 --- a/lib/FaviconFeed.jsm +++ b/lib/FaviconFeed.jsm @@ -5,7 +5,7 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); -Cu.importGlobalProperties(["fetch", "URL"]); +XPCOMUtils.defineLazyGlobalGetters(this, ["fetch"]); const {actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {}); const {PersistentCache} = ChromeUtils.import("resource://activity-stream/lib/PersistentCache.jsm", {}); diff --git a/lib/ShortURL.jsm b/lib/ShortURL.jsm index f02498c0f0..357776a225 100644 --- a/lib/ShortURL.jsm +++ b/lib/ShortURL.jsm @@ -3,7 +3,7 @@ ChromeUtils.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyServiceGetter(this, "IDNService", "@mozilla.org/network/idn-service;1", "nsIIDNService"); -Cu.importGlobalProperties(["URL"]); +XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]); /** * Properly convert internationalized domain names. diff --git a/lib/TippyTopProvider.jsm b/lib/TippyTopProvider.jsm index bfd79a4f6c..def343c729 100644 --- a/lib/TippyTopProvider.jsm +++ b/lib/TippyTopProvider.jsm @@ -2,7 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -Cu.importGlobalProperties(["fetch", "URL"]); +ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); + +XPCOMUtils.defineLazyGlobalGetters(this, ["fetch", "URL"]); const TIPPYTOP_JSON_PATH = "resource://activity-stream/data/content/tippytop/top_sites.json"; const TIPPYTOP_URL_PREFIX = "resource://activity-stream/data/content/tippytop/images/"; diff --git a/lib/TopStoriesFeed.jsm b/lib/TopStoriesFeed.jsm index 9d7222bbd0..3bf77bf471 100644 --- a/lib/TopStoriesFeed.jsm +++ b/lib/TopStoriesFeed.jsm @@ -6,7 +6,7 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); ChromeUtils.import("resource://gre/modules/Services.jsm"); ChromeUtils.import("resource://gre/modules/NewTabUtils.jsm"); -Cu.importGlobalProperties(["fetch"]); +XPCOMUtils.defineLazyGlobalGetters(this, ["fetch"]); const {actionTypes: at, actionCreators: ac} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm", {}); const {Prefs} = ChromeUtils.import("resource://activity-stream/lib/ActivityStreamPrefs.jsm", {}); diff --git a/ping-centre/PingCentre.jsm b/ping-centre/PingCentre.jsm index fda1086d6b..3858adf6de 100644 --- a/ping-centre/PingCentre.jsm +++ b/ping-centre/PingCentre.jsm @@ -4,7 +4,7 @@ ChromeUtils.import("resource://gre/modules/Services.jsm"); ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); -Cu.importGlobalProperties(["fetch"]); +XPCOMUtils.defineLazyGlobalGetters(this, ["fetch"]); ChromeUtils.defineModuleGetter(this, "AppConstants", "resource://gre/modules/AppConstants.jsm"); diff --git a/test/unit/unit-entry.js b/test/unit/unit-entry.js index 0791529d70..e16e6fd493 100644 --- a/test/unit/unit-entry.js +++ b/test/unit/unit-entry.js @@ -171,6 +171,7 @@ const TEST_GLOBAL = { }, XPCOMUtils: { defineLazyGetter(_1, _2, f) { f(); }, + defineLazyGlobalGetters() {}, defineLazyModuleGetter() {}, defineLazyServiceGetter() {}, generateQI() { return {}; }