Bug 1817460 - Change PushBroadcastService to handle its listeners calling directly into ES modules. r=mt

Differential Revision: https://phabricator.services.mozilla.com/D171051

dom/push/PushBroadcastService.sys.mjs

@@ -216,7 +216,7 @@ export var BroadcastService = class {
 
       let module;
       try {
-        module = ChromeUtils.import(moduleURI);
+        module = ChromeUtils.importESModule(moduleURI);
       } catch (e) {
         lazy.console.error(
           "receivedBroadcastMessage: couldn't invoke",

dom/push/test/xpcshell/test_broadcast_success.js

@@ -55,7 +55,7 @@ add_task(async function test_register_success() {
   });
 
   await broadcastService.addListener("broadcast-test", "2018-02-01", {
-    moduleURI: "resource://test/broadcast_handler.jsm",
+    moduleURI: "resource://test/broadcast_handler.sys.mjs",
     symbolName: "broadcastHandler",
   });
 
@@ -155,7 +155,7 @@ add_task(async function test_handle_hello_broadcasts() {
   });
 
   await broadcastService.addListener("broadcast-test", "2018-02-01", {
-    moduleURI: "resource://test/broadcast_handler.jsm",
+    moduleURI: "resource://test/broadcast_handler.sys.mjs",
     symbolName: "broadcastHandler",
   });
 
@@ -228,7 +228,7 @@ add_task(async function test_broadcast_context() {
   const serviceId = "broadcast-test";
   const version = "2018-02-01";
   await broadcastService.addListener(serviceId, version, {
-    moduleURI: "resource://test/broadcast_handler.jsm",
+    moduleURI: "resource://test/broadcast_handler.sys.mjs",
     symbolName: "broadcastHandler",
   });
 

services/settings/remote-settings.sys.mjs

@@ -575,10 +575,7 @@ function remoteSettingsFunction() {
     );
 
     const moduleInfo = {
-      // TODO: This should be `import.meta.url`, however the push service
-      // does not currently support ES modules, so use the old URI which still
-      // works for ChromeUtils.import. See bug 1817460.
-      moduleURI: "resource://services-settings/remote-settings.js",
+      moduleURI: import.meta.url,
       symbolName: "remoteSettingsBroadcastHandler",
     };
     lazy.pushBroadcastService.addListener(