Bug 1519596: Part 1 - Remove several unnecessary/unused ChromeUtils.import() calls. r=Gijs

Differential Revision: https://phabricator.services.mozilla.com/D16377 --HG-- extra : rebase_source : 6c4311387d25de425806aeb6c4691e12c9fcb855
2024-11-24 13:21:05 +00:00 · 2019-01-11 16:59:23 -08:00 · 2019-01-11 16:59:23 -08:00 · 2fe0de01dc
commit 2fe0de01dc
parent 4aadada73d
89 changed files with 6 additions and 136 deletions
--- a/accessible/jsat/AccessFu.jsm
+++ b/accessible/jsat/AccessFu.jsm
@ -11,10 +11,6 @@ ChromeUtils.import("resource://gre/modules/accessibility/Utils.jsm");
 ChromeUtils.defineModuleGetter(this, "Rect",
                               "resource://gre/modules/Geometry.jsm");

-if (Utils.MozBuildApp === "mobile/android") {
-  ChromeUtils.import("resource://gre/modules/Messaging.jsm");
-}
-
 const GECKOVIEW_MESSAGE = {
  ACTIVATE: "GeckoView:AccessibilityActivate",
  BY_GRANULARITY: "GeckoView:AccessibilityByGranularity",
--- a/accessible/tests/mochitest/jsat/jsatcommon.js
+++ b/accessible/tests/mochitest/jsat/jsatcommon.js
@ -16,8 +16,6 @@ var gIterator;

 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/accessibility/Utils.jsm");
-ChromeUtils.import("resource://gre/modules/accessibility/EventManager.jsm");
-ChromeUtils.import("resource://gre/modules/accessibility/Constants.jsm");

 const MovementGranularity = {
  CHARACTER: 1,
--- a/browser/actors/PluginChild.jsm
+++ b/browser/actors/PluginChild.jsm
@ -10,7 +10,6 @@ ChromeUtils.import("resource://gre/modules/ActorChild.jsm");

 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
 ChromeUtils.import("resource://gre/modules/BrowserUtils.jsm");

 ChromeUtils.defineModuleGetter(this, "ContextMenuChild",
--- a/browser/components/customizableui/CustomizeMode.jsm
+++ b/browser/components/customizableui/CustomizeMode.jsm
@ -24,7 +24,6 @@ const kDownloadAutoHidePref = "browser.download.autohideButton";
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource:///modules/CustomizableUI.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/AddonManager.jsm");
 ChromeUtils.import("resource://gre/modules/AppConstants.jsm");

 XPCOMUtils.defineLazyGlobalGetters(this, ["CSS"]);
--- a/browser/components/distribution.js
+++ b/browser/components/distribution.js
@ -11,7 +11,6 @@ const PREF_CACHED_FILE_EXISTENCE  = "distribution.iniFile.exists.value";
 const PREF_CACHED_FILE_APPVERSION = "distribution.iniFile.exists.appversion";

 ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.defineModuleGetter(this, "Preferences",
                               "resource://gre/modules/Preferences.jsm");
--- a/browser/components/downloads/content/indicator.js
+++ b/browser/components/downloads/content/indicator.js
@ -27,8 +27,6 @@

 "use strict";

-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-
 // DownloadsButton

 /**
--- a/browser/components/enterprisepolicies/content/aboutPolicies.js
+++ b/browser/components/enterprisepolicies/content/aboutPolicies.js
@ -4,7 +4,6 @@

 "use strict";

-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");

--- a/browser/components/enterprisepolicies/tests/browser/browser_policy_bookmarks.js
+++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_bookmarks.js
@ -3,7 +3,6 @@

 "use strict";

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");

--- a/browser/components/preferences/clearSiteData.js
+++ b/browser/components/preferences/clearSiteData.js
@ -2,8 +2,6 @@
 * 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/. */

-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 ChromeUtils.import("resource://gre/modules/DownloadUtils.jsm");
 ChromeUtils.import("resource:///modules/SiteDataManager.jsm");

--- a/browser/components/preferences/containers.js
+++ b/browser/components/preferences/containers.js
@ -2,7 +2,6 @@
 * 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/. */

-ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/ContextualIdentityService.jsm");

 /**
--- a/browser/components/preferences/in-content/containers.js
+++ b/browser/components/preferences/in-content/containers.js
@ -4,7 +4,6 @@

 /* import-globals-from preferences.js */

-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 ChromeUtils.import("resource://gre/modules/ContextualIdentityService.jsm");

 const defaultContainerIcon = "fingerprint";
--- a/browser/components/preferences/in-content/extensionControlled.js
+++ b/browser/components/preferences/in-content/extensionControlled.js
@ -6,8 +6,6 @@

 "use strict";

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
 ChromeUtils.defineModuleGetter(this, "AddonManager",
                                  "resource://gre/modules/AddonManager.jsm");
 ChromeUtils.defineModuleGetter(this, "BrowserUtils",
--- a/browser/components/preferences/in-content/main.js
+++ b/browser/components/preferences/in-content/main.js
@ -10,10 +10,8 @@
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/Downloads.jsm");
 ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
-ChromeUtils.import("resource:///modules/ShellService.jsm");
 ChromeUtils.import("resource:///modules/TransientPrefs.jsm");
 ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/DownloadUtils.jsm");
 ChromeUtils.import("resource://gre/modules/L10nRegistry.jsm");
 ChromeUtils.import("resource://gre/modules/Localization.jsm");
 ChromeUtils.defineModuleGetter(this, "CloudStorage",
--- a/browser/components/preferences/in-content/preferences.js
+++ b/browser/components/preferences/in-content/preferences.js
@ -17,7 +17,6 @@
 "use strict";

 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");

 ChromeUtils.defineModuleGetter(this, "formAutofillParent",
                               "resource://formautofill/FormAutofillParent.jsm");
--- a/browser/components/preferences/in-content/privacy.js
+++ b/browser/components/preferences/in-content/privacy.js
@ -5,14 +5,10 @@
 /* import-globals-from extensionControlled.js */
 /* import-globals-from preferences.js */

-/* FIXME: ESlint globals workaround should be removed once bug 1395426 gets fixed */
-/* globals DownloadUtils, LoadContextInfo */
-
 ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/PluralForm.jsm");

-ChromeUtils.defineModuleGetter(this, "PluralForm",
-  "resource://gre/modules/PluralForm.jsm");
+ChromeUtils.defineModuleGetter(this, "DownloadUtils",
+  "resource://gre/modules/DownloadUtils.jsm");
 ChromeUtils.defineModuleGetter(this, "LoginHelper",
  "resource://gre/modules/LoginHelper.jsm");
 ChromeUtils.defineModuleGetter(this, "SiteDataManager",
--- a/browser/components/preferences/in-content/search.js
+++ b/browser/components/preferences/in-content/search.js
@ -5,7 +5,6 @@
 /* import-globals-from extensionControlled.js */
 /* import-globals-from preferences.js */

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.defineModuleGetter(this, "PlacesUtils",
                               "resource://gre/modules/PlacesUtils.jsm");
 ChromeUtils.defineModuleGetter(this, "ExtensionSettingsStore",
--- a/browser/components/preferences/in-content/syncDisconnect.js
+++ b/browser/components/preferences/in-content/syncDisconnect.js
@ -2,11 +2,8 @@
 // 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/.

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetters(this, {
-  SyncDisconnect: "resource://services-sync/SyncDisconnect.jsm",
-});
+ChromeUtils.defineModuleGetter(this, "SyncDisconnect",
+  "resource://services-sync/SyncDisconnect.jsm");

 let gSyncDisconnectDialog = {
  init() {
--- a/browser/components/preferences/in-content/tests/browser_advanced_update.js
+++ b/browser/components/preferences/in-content/tests/browser_advanced_update.js
@ -5,8 +5,6 @@

 const Cm = Components.manager;

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
 const uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator);

 const mockUpdateManager = {
--- a/browser/components/preferences/in-content/tests/browser_bug410900.js
+++ b/browser/components/preferences/in-content/tests/browser_bug410900.js
@ -1,9 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
 * http://creativecommons.org/publicdomain/zero/1.0/ */

-ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");
-ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-
 function test() {
  waitForExplicitFinish();

--- a/browser/components/preferences/in-content/tests/browser_bug731866.js
+++ b/browser/components/preferences/in-content/tests/browser_bug731866.js
@ -1,9 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
 * http://creativecommons.org/publicdomain/zero/1.0/ */

-ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");
-ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-
 const browserContainersGroupDisabled = !SpecialPowers.getBoolPref("privacy.userContext.ui.enabled");

 function test() {
--- a/browser/components/preferences/in-content/tests/browser_bug795764_cachedisabled.js
+++ b/browser/components/preferences/in-content/tests/browser_bug795764_cachedisabled.js
@ -1,9 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
 * http://creativecommons.org/publicdomain/zero/1.0/ */

-ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");
-ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-
 function test() {
  waitForExplicitFinish();

--- a/browser/components/preferences/in-content/tests/browser_site_autoplay_media_exceptions.js
+++ b/browser/components/preferences/in-content/tests/browser_site_autoplay_media_exceptions.js
@ -1,7 +1,5 @@
 "use strict";

-ChromeUtils.import("resource:///modules/SitePermissions.jsm");
-
 const URL = "http://www.example.com";
 const PRINCIPAL = Services.scriptSecurityManager
  .createCodebasePrincipal(Services.io.newURI(URL), {});
--- a/browser/components/preferences/siteDataSettings.js
+++ b/browser/components/preferences/siteDataSettings.js
@ -6,7 +6,6 @@
 "use strict";

 ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");

 ChromeUtils.defineModuleGetter(this, "SiteDataManager",
--- a/browser/components/preferences/translation.js
+++ b/browser/components/preferences/translation.js
@ -5,7 +5,6 @@

 "use strict";

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");

 const kPermissionType = "translate";
--- a/browser/components/sessionstore/content/aboutSessionRestore.js
+++ b/browser/components/sessionstore/content/aboutSessionRestore.js
@ -5,7 +5,6 @@
 "use strict";

 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.defineModuleGetter(this, "AppConstants",
  "resource://gre/modules/AppConstants.jsm");
 ChromeUtils.defineModuleGetter(this, "SessionStore",
--- a/browser/components/sessionstore/test/content.js
+++ b/browser/components/sessionstore/test/content.js
@ -6,8 +6,6 @@

 "use strict";

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
 function executeSoon(callback) {
  Services.tm.dispatchToMainThread(callback);
 }
--- a/browser/components/syncedtabs/sidebar.js
+++ b/browser/components/syncedtabs/sidebar.js
@ -4,7 +4,6 @@

 "use strict";

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://services-sync/SyncedTabs.jsm");
 ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsDeckComponent.js");
 ChromeUtils.import("resource:///actors/LightweightThemeChild.jsm");
--- a/browser/components/syncedtabs/test/xpcshell/test_SyncedTabsDeckComponent.js
+++ b/browser/components/syncedtabs/test/xpcshell/test_SyncedTabsDeckComponent.js
@ -6,7 +6,6 @@ let { TabListComponent } = ChromeUtils.import("resource:///modules/syncedtabs/Ta
 let { SyncedTabsListStore } = ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsListStore.js", {});
 let { SyncedTabsDeckStore } = ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsDeckStore.js", {});
 let { TabListView } = ChromeUtils.import("resource:///modules/syncedtabs/TabListView.js", {});
-let { DeckView } = ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsDeckView.js", {});


 add_task(async function testInitUninit() {
--- a/browser/components/syncedtabs/test/xpcshell/test_TabListComponent.js
+++ b/browser/components/syncedtabs/test/xpcshell/test_TabListComponent.js
@ -3,7 +3,6 @@
 let { SyncedTabs } = ChromeUtils.import("resource://services-sync/SyncedTabs.jsm", {});
 let { TabListComponent } = ChromeUtils.import("resource:///modules/syncedtabs/TabListComponent.js", {});
 let { SyncedTabsListStore } = ChromeUtils.import("resource:///modules/syncedtabs/SyncedTabsListStore.js", {});
-let { View } = ChromeUtils.import("resource:///modules/syncedtabs/TabListView.js", {});
 let { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm", {});

 const ACTION_METHODS = [
--- a/browser/components/uitour/UITour.jsm
+++ b/browser/components/uitour/UITour.jsm
@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = ["UITour"];
 ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/TelemetryController.jsm");
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");

 XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
--- a/browser/extensions/formautofill/FormAutofillNameUtils.jsm
+++ b/browser/extensions/formautofill/FormAutofillNameUtils.jsm
@ -6,8 +6,6 @@

 var EXPORTED_SYMBOLS = ["FormAutofillNameUtils"];

-ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");
-
 // FormAutofillNameUtils is initially translated from
 // https://cs.chromium.org/chromium/src/components/autofill/core/browser/autofill_data_util.cc?rcl=b861deff77abecff11ae6a9f6946e9cc844b9817
 var FormAutofillNameUtils = {
--- a/browser/extensions/formautofill/FormAutofillSync.jsm
+++ b/browser/extensions/formautofill/FormAutofillSync.jsm
@ -11,7 +11,6 @@ ChromeUtils.import("resource://services-sync/engines.js");
 ChromeUtils.import("resource://services-sync/record.js");
 ChromeUtils.import("resource://services-sync/util.js");
 ChromeUtils.import("resource://services-sync/constants.js");
-ChromeUtils.import("resource://formautofill/FormAutofillUtils.jsm");

 ChromeUtils.defineModuleGetter(this, "Log",
                               "resource://gre/modules/Log.jsm");
--- a/browser/modules/ContentObservers.js
+++ b/browser/modules/ContentObservers.js
@ -15,7 +15,6 @@
 "use strict";

 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");

 ChromeUtils.defineModuleGetter(this, "WebRTCChild",
  "resource:///actors/WebRTCChild.jsm");
--- a/browser/modules/Windows8WindowFrameColor.jsm
+++ b/browser/modules/Windows8WindowFrameColor.jsm
@ -6,7 +6,7 @@

 var EXPORTED_SYMBOLS = ["Windows8WindowFrameColor"];

-var Registry = ChromeUtils.import("resource://gre/modules/WindowsRegistry.jsm").WindowsRegistry;
+var {WindowsRegistry: Registry} = ChromeUtils.import("resource://gre/modules/WindowsRegistry.jsm", null);

 var Windows8WindowFrameColor = {
  _windowFrameColor: null,
--- a/browser/modules/test/unit/test_LiveBookmarkMigrator.js
+++ b/browser/modules/test/unit/test_LiveBookmarkMigrator.js
@ -5,8 +5,6 @@
 /* globals ChromeUtils, Assert, add_task */
 "use strict";

-ChromeUtils.import("resource://gre/modules/Services.jsm");
-
 // Ensure we initialize places:
 do_get_profile();

--- a/chrome/test/unit/test_bug848297.js
+++ b/chrome/test/unit/test_bug848297.js
@ -8,7 +8,6 @@ var MANIFESTS = [
 ];

 // Stub in the locale service so we can control what gets returned as the OS locale setting
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");

 registerManifests(MANIFESTS);
--- a/chrome/test/unit/test_no_remote_registration.js
+++ b/chrome/test/unit/test_no_remote_registration.js
@ -10,8 +10,6 @@ var manifests = [
 ];
 registerManifests(manifests);

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
 function ProtocolHandler(aScheme, aFlags) {
  this.scheme = aScheme;
  this.protocolFlags = aFlags;
--- a/docshell/test/browser/file_bug422543_script.js
+++ b/docshell/test/browser/file_bug422543_script.js
@ -1,5 +1,3 @@
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
 function SHistoryListener() {
 }

--- a/docshell/test/chrome/test_bug909218.html
+++ b/docshell/test/chrome/test_bug909218.html
@ -9,8 +9,6 @@
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(test);

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
 // The default flags we will stick on the docShell - every request made by the
 // docShell should include those flags.
 const TEST_FLAGS = Ci.nsIRequest.LOAD_ANONYMOUS |
--- a/docshell/test/chrome/test_viewsource_forbidden_in_iframe.xul
+++ b/docshell/test/chrome/test_viewsource_forbidden_in_iframe.xul
@ -20,8 +20,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=624883
  <script type="application/javascript">
  <![CDATA[

-  ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
  SimpleTest.waitForExplicitFinish();

  // We create a promise that will resolve with the error message
--- a/dom/base/DOMRequestHelper.jsm
+++ b/dom/base/DOMRequestHelper.jsm
@ -18,7 +18,6 @@
 */
 var EXPORTED_SYMBOLS = ["DOMRequestIpcHelper"];

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");

 function DOMRequestIpcHelper() {
--- a/dom/base/IndexedDBHelper.jsm
+++ b/dom/base/IndexedDBHelper.jsm
@ -14,7 +14,6 @@ if (DEBUG) {

 var EXPORTED_SYMBOLS = ["IndexedDBHelper"];

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.importGlobalProperties(["indexedDB"]);

 ChromeUtils.defineModuleGetter(this, 'Services',
--- a/dom/base/ProcessSelector.js
+++ b/dom/base/ProcessSelector.js
@ -3,7 +3,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import('resource://gre/modules/Services.jsm');

 // Fills up aProcesses until max and then selects randomly from the available
 // ones.
--- a/dom/base/test/chrome/file_bug549682.xul
+++ b/dom/base/test/chrome/file_bug549682.xul
@ -18,8 +18,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=549682
  var ppm = Cc["@mozilla.org/parentprocessmessagemanager;1"].getService();
  var cpm = Cc["@mozilla.org/childprocessmessagemanager;1"].getService();

-  ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
  function ok(cond, msg) {
    opener.wrappedJSObject.ok(cond, msg);
  }
--- a/dom/base/test/chrome/test_bug800386.xul
+++ b/dom/base/test/chrome/test_bug800386.xul
@ -18,8 +18,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=800386
  <script type="application/javascript">
  <![CDATA[
  /** Test for Bug 800386 **/
-  ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
  SimpleTest.waitForExplicitFinish();

  var triedForwarding = false;
--- a/dom/base/test/test_navigator_resolve_identity_xrays.xul
+++ b/dom/base/test/test_navigator_resolve_identity_xrays.xul
@ -23,8 +23,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=985827

  SimpleTest.waitForExplicitFinish();

-  ChromeUtils.import("resource://gre/modules/Services.jsm");
-
  addLoadEvent(function() {
    var iframe = document.getElementById("t");

--- a/dom/bindings/test/TestInterfaceJSMaplike.js
+++ b/dom/bindings/test/TestInterfaceJSMaplike.js
@ -6,7 +6,6 @@
 "use strict";

 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");

 function TestInterfaceJSMaplike() {}

--- a/dom/browser-element/BrowserElementChildPreload.js
+++ b/dom/browser-element/BrowserElementChildPreload.js
@ -12,7 +12,6 @@ debug("loaded");

 var BrowserElementIsReady;

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/BrowserElementPromptService.jsm");

--- a/dom/browser-element/BrowserElementParent.js
+++ b/dom/browser-element/BrowserElementParent.js
@ -10,7 +10,6 @@
 */

 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/BrowserElementPromptService.jsm");

--- a/dom/browser-element/BrowserElementPromptService.jsm
+++ b/dom/browser-element/BrowserElementPromptService.jsm
@ -9,7 +9,6 @@ var Cm = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);

 var EXPORTED_SYMBOLS = ["BrowserElementPromptService"];

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");

 const NS_PREFBRANCH_PREFCHANGE_TOPIC_ID = "nsPref:changed";
--- a/dom/push/PushRecord.jsm
+++ b/dom/push/PushRecord.jsm
@ -6,7 +6,6 @@

 ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");

 ChromeUtils.defineModuleGetter(this, "EventDispatcher",
                               "resource://gre/modules/Messaging.jsm");
--- a/dom/push/PushServiceHttp2.jsm
+++ b/dom/push/PushServiceHttp2.jsm
@ -10,7 +10,6 @@ const {PushRecord} = ChromeUtils.import("resource://gre/modules/PushRecord.jsm")
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-ChromeUtils.import("resource://gre/modules/IndexedDBHelper.jsm");
 ChromeUtils.import("resource://gre/modules/Timer.jsm");

 const {
--- a/dom/push/PushServiceWebSocket.jsm
+++ b/dom/push/PushServiceWebSocket.jsm
@ -5,10 +5,8 @@

 "use strict";

-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 ChromeUtils.import("resource://gre/modules/Preferences.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");

 const {PushDB} = ChromeUtils.import("resource://gre/modules/PushDB.jsm");
--- a/dom/xslt/xslt/txEXSLTRegExFunctions.jsm
+++ b/dom/xslt/xslt/txEXSLTRegExFunctions.jsm
@ -3,8 +3,6 @@
 * 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/. */

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
 function match(str, regex, flags, doc) {
    var docFrag = doc.createDocumentFragment();
    var re = new RegExp(regex, flags);
--- a/services/fxaccounts/FxAccounts.jsm
+++ b/services/fxaccounts/FxAccounts.jsm
@ -5,7 +5,6 @@

 ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
 ChromeUtils.import("resource://services-common/utils.js");
-ChromeUtils.import("resource://services-common/rest.js");
 ChromeUtils.import("resource://services-crypto/utils.js");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
--- a/services/settings/RemoteSettingsComponents.js
+++ b/services/settings/RemoteSettingsComponents.js
@ -7,7 +7,6 @@ var EXPORTED_SYMBOLS = [
  "RemoteSettingsTimer",
 ];

-ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.defineModuleGetter(this, "RemoteSettings",
  "resource://services-settings/remote-settings.js");
--- a/services/sync/modules/addonsreconciler.js
+++ b/services/sync/modules/addonsreconciler.js
@ -18,7 +18,6 @@
 "use strict";

 ChromeUtils.import("resource://gre/modules/Log.jsm");
-ChromeUtils.import("resource://services-common/async.js");
 ChromeUtils.import("resource://services-sync/util.js");
 ChromeUtils.import("resource://gre/modules/AddonManager.jsm");

--- a/services/sync/modules/bookmark_repair.js
+++ b/services/sync/modules/bookmark_repair.js
@ -6,7 +6,6 @@

 var EXPORTED_SYMBOLS = ["BookmarkRepairRequestor", "BookmarkRepairResponder"];

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/Preferences.jsm");
 ChromeUtils.import("resource://gre/modules/Log.jsm");
--- a/services/sync/modules/bookmark_validator.js
+++ b/services/sync/modules/bookmark_validator.js
@ -4,7 +4,6 @@

 "use strict";

-ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://services-common/utils.js");
 ChromeUtils.import("resource://services-sync/util.js");
--- a/services/sync/modules/collection_repair.js
+++ b/services/sync/modules/collection_repair.js
@ -3,7 +3,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://services-sync/main.js");

 ChromeUtils.defineModuleGetter(this, "BookmarkRepairRequestor",
--- a/services/sync/modules/collection_validator.js
+++ b/services/sync/modules/collection_validator.js
@ -4,8 +4,6 @@

 "use strict";

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
 ChromeUtils.defineModuleGetter(this, "Async",
                               "resource://services-common/async.js");

--- a/services/sync/modules/doctor.js
+++ b/services/sync/modules/doctor.js
@ -11,7 +11,6 @@

 var EXPORTED_SYMBOLS = ["Doctor"];

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/Log.jsm");
 ChromeUtils.import("resource://services-common/async.js");
--- a/services/sync/modules/engines.js
+++ b/services/sync/modules/engines.js
@ -15,7 +15,6 @@ ChromeUtils.import("resource://gre/modules/JSONFile.jsm");
 ChromeUtils.import("resource://gre/modules/Log.jsm");
 ChromeUtils.import("resource://services-common/async.js");
 ChromeUtils.import("resource://services-common/observers.js");
-ChromeUtils.import("resource://services-common/utils.js");
 ChromeUtils.import("resource://services-sync/constants.js");
 ChromeUtils.import("resource://services-sync/record.js");
 ChromeUtils.import("resource://services-sync/resource.js");
--- a/services/sync/modules/engines/addons.js
+++ b/services/sync/modules/engines/addons.js
@ -36,7 +36,6 @@
 */
 "use strict";

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/Preferences.jsm");
 ChromeUtils.import("resource://services-sync/addonutils.js");
--- a/services/sync/modules/engines/clients.js
+++ b/services/sync/modules/engines/clients.js
@ -25,7 +25,6 @@ var EXPORTED_SYMBOLS = [
  "ClientsRec",
 ];

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://services-common/async.js");
 ChromeUtils.import("resource://services-sync/constants.js");
--- a/services/sync/modules/engines/extension-storage.js
+++ b/services/sync/modules/engines/extension-storage.js
@ -6,7 +6,6 @@

 var EXPORTED_SYMBOLS = ["ExtensionStorageEngine"];

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://services-sync/constants.js");
 ChromeUtils.import("resource://services-sync/engines.js");
 ChromeUtils.import("resource://services-sync/util.js");
--- a/services/sync/modules/engines/forms.js
+++ b/services/sync/modules/engines/forms.js
@ -4,7 +4,6 @@

 var EXPORTED_SYMBOLS = ["FormEngine", "FormRec", "FormValidator"];

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://services-sync/engines.js");
 ChromeUtils.import("resource://services-sync/record.js");
 ChromeUtils.import("resource://services-sync/util.js");
--- a/services/sync/modules/engines/history.js
+++ b/services/sync/modules/engines/history.js
@ -7,7 +7,6 @@ var EXPORTED_SYMBOLS = ["HistoryEngine", "HistoryRec"];
 const HISTORY_TTL = 5184000; // 60 days in milliseconds
 const THIRTY_DAYS_IN_MS = 2592000000; // 30 days in milliseconds

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://services-common/async.js");
 ChromeUtils.import("resource://services-common/utils.js");
 ChromeUtils.import("resource://services-sync/constants.js");
--- a/services/sync/modules/keys.js
+++ b/services/sync/modules/keys.js
@ -9,7 +9,6 @@ var EXPORTED_SYMBOLS = [
 ];

 ChromeUtils.import("resource://services-common/utils.js");
-ChromeUtils.import("resource://services-sync/constants.js");
 ChromeUtils.import("resource://gre/modules/Log.jsm");
 ChromeUtils.import("resource://services-sync/main.js");
 ChromeUtils.import("resource://services-sync/util.js");
--- a/services/sync/modules/stages/declined.js
+++ b/services/sync/modules/stages/declined.js
@ -11,11 +11,9 @@

 var EXPORTED_SYMBOLS = ["DeclinedEngines"];

-ChromeUtils.import("resource://services-sync/constants.js");
 ChromeUtils.import("resource://gre/modules/Log.jsm");
 ChromeUtils.import("resource://services-common/utils.js");
 ChromeUtils.import("resource://services-common/observers.js");
-ChromeUtils.import("resource://gre/modules/Preferences.jsm");



--- a/services/sync/modules/stages/enginesync.js
+++ b/services/sync/modules/stages/enginesync.js
@ -8,7 +8,6 @@

 var EXPORTED_SYMBOLS = ["EngineSynchronizer"];

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Log.jsm");
 ChromeUtils.import("resource://services-sync/constants.js");
 ChromeUtils.import("resource://services-sync/util.js");
--- a/services/sync/modules/status.js
+++ b/services/sync/modules/status.js
@ -7,7 +7,6 @@ var EXPORTED_SYMBOLS = ["Status"];
 ChromeUtils.import("resource://services-sync/constants.js");
 ChromeUtils.import("resource://gre/modules/Log.jsm");
 ChromeUtils.import("resource://services-sync/browserid_identity.js");
-ChromeUtils.import("resource://gre/modules/Services.jsm");

 var Status = {
  _log: Log.repository.getLogger("Sync.Status"),
--- a/services/sync/tps/extensions/tps/api.js
+++ b/services/sync/tps/extensions/tps/api.js
@ -5,7 +5,6 @@
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Timer.jsm");

 /* globals ExtensionAPI */

--- a/services/sync/tps/extensions/tps/resource/modules/addons.jsm
+++ b/services/sync/tps/extensions/tps/resource/modules/addons.jsm
@ -7,7 +7,6 @@ var EXPORTED_SYMBOLS = ["Addon", "STATE_ENABLED", "STATE_DISABLED"];

 ChromeUtils.import("resource://gre/modules/AddonManager.jsm");
 ChromeUtils.import("resource://services-sync/addonutils.js");
-ChromeUtils.import("resource://services-sync/util.js");
 ChromeUtils.import("resource://tps/logger.jsm");

 const STATE_ENABLED = 1;
--- a/testing/mochitest/api.js
+++ b/testing/mochitest/api.js
@ -5,9 +5,7 @@
 /* globals ExtensionAPI */

 ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");

 function loadChromeScripts(win) {
  Services.scriptloader.loadSubScript("chrome://mochikit/content/chrome-harness.js", win);
--- a/testing/mochitest/tests/Harness_sanity/ImportTesting.jsm
+++ b/testing/mochitest/tests/Harness_sanity/ImportTesting.jsm
@ -1,5 +1,3 @@
-var EXPORTED_SYMBOLS = ["ImportTesting"];
-
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+var EXPORTED_SYMBOLS = [];

 // Empty module for testing via SpecialPowers.importInMainProcess.
--- a/testing/talos/talos/tests/tabswitch/api.js
+++ b/testing/talos/talos/tests/tabswitch/api.js
@ -3,7 +3,6 @@
 /* globals ExtensionAPI */

 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/remotepagemanager/RemotePageManagerParent.jsm");

 let context = {};
--- a/toolkit/components/normandy/lib/AddonStudies.jsm
+++ b/toolkit/components/normandy/lib/AddonStudies.jsm
@ -26,7 +26,6 @@
 *   Date when the study was ended.
 */

-ChromeUtils.import("resource://gre/modules/osfile.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");

 ChromeUtils.defineModuleGetter(this, "IndexedDB", "resource://gre/modules/IndexedDB.jsm");
--- a/toolkit/components/passwordmgr/LoginImport.jsm
+++ b/toolkit/components/passwordmgr/LoginImport.jsm
@ -17,8 +17,6 @@ var EXPORTED_SYMBOLS = [

 // Globals

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
 ChromeUtils.defineModuleGetter(this, "OS",
                               "resource://gre/modules/osfile.jsm");
 ChromeUtils.defineModuleGetter(this, "Sqlite",
--- a/toolkit/components/passwordmgr/LoginManagerContent.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerContent.jsm
@ -15,7 +15,6 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
 ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Timer.jsm");

 ChromeUtils.defineModuleGetter(this, "DeferredTask", "resource://gre/modules/DeferredTask.jsm");
 ChromeUtils.defineModuleGetter(this, "FormLikeFactory",
--- a/toolkit/components/passwordmgr/LoginStore.jsm
+++ b/toolkit/components/passwordmgr/LoginStore.jsm
@ -48,7 +48,6 @@ var EXPORTED_SYMBOLS = [

 // Globals

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");

 ChromeUtils.defineModuleGetter(this, "JSONFile",
--- a/toolkit/components/passwordmgr/OSCrypto_win.js
+++ b/toolkit/components/passwordmgr/OSCrypto_win.js
@ -4,9 +4,6 @@

 "use strict";

-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
 ChromeUtils.defineModuleGetter(this, "ctypes", "resource://gre/modules/ctypes.jsm");

 const FLAGS_NOT_SET = 0;
--- a/toolkit/components/passwordmgr/content/passwordManager.js
+++ b/toolkit/components/passwordmgr/content/passwordManager.js
@ -4,7 +4,6 @@

 /** * =================== SAVED SIGNONS CODE =================== ***/
 ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");

 ChromeUtils.defineModuleGetter(this, "DeferredTask",
--- a/toolkit/components/passwordmgr/nsLoginManager.js
+++ b/toolkit/components/passwordmgr/nsLoginManager.js
@ -6,10 +6,8 @@

 const PERMISSION_SAVE_LOGINS = "login-saving";

-ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/Timer.jsm");

 ChromeUtils.defineModuleGetter(this, "BrowserUtils",
                               "resource://gre/modules/BrowserUtils.jsm");
--- a/toolkit/components/passwordmgr/test/LoginTestUtils.jsm
+++ b/toolkit/components/passwordmgr/test/LoginTestUtils.jsm
@ -12,7 +12,6 @@ var EXPORTED_SYMBOLS = [
 ];

 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");

 ChromeUtils.import("resource://testing-common/Assert.jsm");
 ChromeUtils.import("resource://testing-common/TestUtils.jsm");
--- a/toolkit/components/telemetry/app/TelemetryController.jsm
+++ b/toolkit/components/telemetry/app/TelemetryController.jsm
@ -12,7 +12,6 @@ ChromeUtils.import("resource://gre/modules/Services.jsm", this);
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", this);
 ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm", this);
 ChromeUtils.import("resource://gre/modules/DeferredTask.jsm", this);
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
 ChromeUtils.import("resource://gre/modules/TelemetryUtils.jsm", this);
 ChromeUtils.import("resource://gre/modules/AppConstants.jsm");

--- a/toolkit/modules/PromiseUtils.jsm
+++ b/toolkit/modules/PromiseUtils.jsm
@ -7,7 +7,6 @@
 var EXPORTED_SYMBOLS = ["PromiseUtils"];

 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/Timer.jsm");

 var PromiseUtils = {
  /*
--- a/toolkit/modules/RemoteController.js
+++ b/toolkit/modules/RemoteController.js
@ -3,8 +3,6 @@
 // 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/.

-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
 function RemoteController(browser) {
  this._browser = browser;

--- a/uriloader/exthandler/tests/HandlerServiceTestUtils.jsm
+++ b/uriloader/exthandler/tests/HandlerServiceTestUtils.jsm
@ -12,7 +12,6 @@ var EXPORTED_SYMBOLS = [
 ];

 ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://testing-common/Assert.jsm");