Commit 8acde8d7 authored by Mark Banner's avatar Mark Banner
Browse files

Bug 1816934 - Update consumers of services/settings to import ES modules... 

Bug 1816934 - Update consumers of services/settings to import ES modules directly. r=leplatrem,extension-reviewers,settings-reviewers,credential-management-reviewers,sgalich,mconley,robwu

Differential Revision: https://phabricator.services.mozilla.com/D169934
parent 33aca634

browser/components/BrowserGlue.sys.mjs

+1 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ ChromeUtils.defineESModuleGetters(lazy, { 
  PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",

  PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",

  QuickSuggest: "resource:///modules/QuickSuggest.sys.mjs",

  RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",

  ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs",

  SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.sys.mjs",

  SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs",
@@ -89,7 +90,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { 
  PluralForm: "resource://gre/modules/PluralForm.jsm",

  ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.jsm",

  PublicSuffixList: "resource://gre/modules/netwerk-dns/PublicSuffixList.jsm",

  RemoteSettings: "resource://services-settings/remote-settings.js",



  RemoteSecuritySettings:

    "resource://gre/modules/psm/RemoteSecuritySettings.jsm",

browser/components/aboutlogins/LoginBreaches.sys.mjs

+6 −2
Original line number Diff line number Diff line
@@ -11,10 +11,14 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; 


const lazy = {};



ChromeUtils.defineESModuleGetters(lazy, {

  RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",

  RemoteSettingsClient:

    "resource://services-settings/RemoteSettingsClient.sys.mjs",

});



XPCOMUtils.defineLazyModuleGetters(lazy, {

  LoginHelper: "resource://gre/modules/LoginHelper.jsm",

  RemoteSettings: "resource://services-settings/remote-settings.js",

  RemoteSettingsClient: "resource://services-settings/RemoteSettingsClient.jsm",

});



export const LoginBreaches = {

browser/components/aboutlogins/tests/browser/head.js

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 
let { LoginBreaches } = ChromeUtils.importESModule(

  "resource:///modules/LoginBreaches.sys.mjs"

);

let { RemoteSettings } = ChromeUtils.import(

  "resource://services-settings/remote-settings.js"

let { RemoteSettings } = ChromeUtils.importESModule(

  "resource://services-settings/remote-settings.sys.mjs"

);

let { _AboutLogins } = ChromeUtils.importESModule(

  "resource:///actors/AboutLoginsParent.sys.mjs"

browser/components/aboutlogins/tests/unit/test_getPotentialBreachesByLoginGUID.js

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 


"use strict";



const { RemoteSettings } = ChromeUtils.import(

  "resource://services-settings/remote-settings.js"

const { RemoteSettings } = ChromeUtils.importESModule(

  "resource://services-settings/remote-settings.sys.mjs"

);



// Initializing BrowserGlue requires a profile on Windows.

browser/components/doh/DoHConfig.sys.mjs

+2 −3
Original line number Diff line number Diff line
@@ -8,9 +8,8 @@ 
 * sourced from either Remote Settings or pref values, with Remote Settings

 * being preferred.

 */

const { RemoteSettings } = ChromeUtils.import(

  "resource://services-settings/remote-settings.js"

);



import { RemoteSettings } from "resource://services-settings/remote-settings.sys.mjs";



const lazy = {};