From a7712e985a70f525043b1a28d13fa8dec0c9d91e Mon Sep 17 00:00:00 2001
From: Zibi Braniecki <zbraniecki@mozilla.com>
Date: Fri, 10 Apr 2020 23:35:58 +0000
Subject: [PATCH] Bug 1621674 - Update tests to use Localization WebIDL.
 r=jfkthame,Mardak

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

--HG--
extra : moz-landing-system : lando
---
 .../test/unit/asrouter/RemoteL10n.test.js     | 18 ++++++++++++------
 .../dom_localization/test_attr_sanitized.html |  5 +++--
 .../dom_localization/test_connectRoot.html    |  5 +++--
 .../test_connectRoot_webcomponent.html        |  5 +++--
 .../dom_localization/test_disconnectRoot.html |  5 +++--
 .../dom_localization/test_domloc.xhtml        |  5 +++--
 .../dom_localization/test_getAttributes.html  |  5 +++--
 .../dom_localization/test_l10n_mutations.html |  5 +++--
 .../dom_localization/test_overlay.html        |  5 +++--
 .../test_overlay_missing_all.html             |  5 +++--
 .../test_overlay_missing_children.html        |  5 +++--
 .../test_overlay_repeated.html                |  5 +++--
 .../test_overlay_sanitized.html               |  5 +++--
 .../test_repeated_l10nid.html                 |  5 +++--
 .../dom_localization/test_setAttributes.html  |  5 +++--
 .../test_translateElements.html               |  5 +++--
 .../test_translateFragment.html               |  5 +++--
 .../dom_localization/test_translateRoots.html |  5 +++--
 .../test_disconnectedRoot_webcomponent.html   |  5 +++--
 .../localization/test_formatMessages.html     |  5 +++--
 .../localization/test_formatValue.html        |  5 +++--
 .../localization/test_formatValues.html       |  5 +++--
 intl/l10n/test/test_localization.js           | 19 +++++++++----------
 intl/l10n/test/test_localization_sync.js      | 15 +++++++--------
 intl/l10n/test/test_pseudo.js                 | 11 ++++-------
 25 files changed, 95 insertions(+), 73 deletions(-)

diff --git a/browser/components/newtab/test/unit/asrouter/RemoteL10n.test.js b/browser/components/newtab/test/unit/asrouter/RemoteL10n.test.js
index 114010f522b5..7552b5236469 100644
--- a/browser/components/newtab/test/unit/asrouter/RemoteL10n.test.js
+++ b/browser/components/newtab/test/unit/asrouter/RemoteL10n.test.js
@@ -55,30 +55,36 @@ describe("RemoteL10n", () => {
 
       assert.calledOnce(domL10nStub);
       const { args } = domL10nStub.firstCall;
-      // The first arg is the resource array, and the second one is the bundle generator.
-      assert.equal(args.length, 2);
+      // The first arg is the resource array,
+      // the second one is false (use async),
+      // and the third one is the bundle generator.
+      assert.equal(args.length, 3);
       assert.deepEqual(args[0], [
         "browser/newtab/asrouter.ftl",
         "browser/branding/brandings.ftl",
         "browser/branding/sync-brand.ftl",
         "branding/brand.ftl",
       ]);
-      assert.isFunction(args[1]);
+      assert.isFalse(args[1]);
+      assert.isFunction(args[2].generateBundles);
     });
     it("should load the local Fluent file if USE_REMOTE_L10N_PREF is false", () => {
       sandbox.stub(global.Services.prefs, "getBoolPref").returns(false);
       RemoteL10n._createDOML10n();
 
       const { args } = domL10nStub.firstCall;
-      // The first arg is the resource array, and the second one should be null.
-      assert.equal(args.length, 2);
+      // The first arg is the resource array,
+      // the second one is false (use async),
+      // and the third one is null.
+      assert.equal(args.length, 3);
       assert.deepEqual(args[0], [
         "browser/newtab/asrouter.ftl",
         "browser/branding/brandings.ftl",
         "browser/branding/sync-brand.ftl",
         "branding/brand.ftl",
       ]);
-      assert.isUndefined(args[1]);
+      assert.isFalse(args[1]);
+      assert.isEmpty(args[2]);
     });
   });
 });
diff --git a/dom/l10n/tests/mochitest/dom_localization/test_attr_sanitized.html b/dom/l10n/tests/mochitest/dom_localization/test_attr_sanitized.html
index b61de5b223b1..19ff6aee2faa 100644
--- a/dom/l10n/tests/mochitest/dom_localization/test_attr_sanitized.html
+++ b/dom/l10n/tests/mochitest/dom_localization/test_attr_sanitized.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
-  async function* mockGenerateMessages(resourceIds) {
+  async function* generateBundles(resourceIds) {
     const bundle = new FluentBundle("en-US");
     bundle.addResource(new FluentResource(`
 key1 = Value for Key 1
@@ -21,7 +21,8 @@ key2 = Value for <a>Key 2<a/>.
   addLoadEvent(async () => {
     const domLoc = new DOMLocalization(
       [],
-      mockGenerateMessages
+      false,
+      { generateBundles },
     );
 
     await domLoc.translateFragment(document.body);
diff --git a/dom/l10n/tests/mochitest/dom_localization/test_connectRoot.html b/dom/l10n/tests/mochitest/dom_localization/test_connectRoot.html
index 6a6a472d3450..ae6c6a8e01f3 100644
--- a/dom/l10n/tests/mochitest/dom_localization/test_connectRoot.html
+++ b/dom/l10n/tests/mochitest/dom_localization/test_connectRoot.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
-  async function* mockGenerateMessages(resourceIds) {
+  async function* generateBundles(resourceIds) {
     const bundle = new FluentBundle("en-US");
     bundle.addResource(new FluentResource(`
 key1 = Value for Key 1
@@ -22,7 +22,8 @@ key1 = Value for Key 1
 
     const domLoc = new DOMLocalization(
       [],
-      mockGenerateMessages
+      false,
+      { generateBundles },
     );
 
     await domLoc.translateRoots();
diff --git a/dom/l10n/tests/mochitest/dom_localization/test_connectRoot_webcomponent.html b/dom/l10n/tests/mochitest/dom_localization/test_connectRoot_webcomponent.html
index 9fa5d92d4702..49ead91d4bbf 100644
--- a/dom/l10n/tests/mochitest/dom_localization/test_connectRoot_webcomponent.html
+++ b/dom/l10n/tests/mochitest/dom_localization/test_connectRoot_webcomponent.html
@@ -44,7 +44,7 @@
   </script>
   <script type="application/javascript">
   "use strict";
-  async function* mockGenerateMessages(resourceIds) {
+  async function* generateBundles(resourceIds) {
     const bundle = new FluentBundle("en-US");
     bundle.addResource(new FluentResource(`
 key1 = Value for Key 1
@@ -54,7 +54,8 @@ key1 = Value for Key 1
 
   document.domLoc = new DOMLocalization(
     [],
-    mockGenerateMessages
+    false,
+    { generateBundles }
   );
   </script>
 </head>
diff --git a/dom/l10n/tests/mochitest/dom_localization/test_disconnectRoot.html b/dom/l10n/tests/mochitest/dom_localization/test_disconnectRoot.html
index db91ca428f71..58279c4dece5 100644
--- a/dom/l10n/tests/mochitest/dom_localization/test_disconnectRoot.html
+++ b/dom/l10n/tests/mochitest/dom_localization/test_disconnectRoot.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
-  async function* mockGenerateMessages(resourceIds) {
+  async function* generateBundles(resourceIds) {
     const bundle = new FluentBundle("en-US");
     bundle.addResource(new FluentResource(`
 key1 = Value for Key 1
@@ -23,7 +23,8 @@ key2 = Value for Key 2
 
     const domLoc = new DOMLocalization(
       [],
-      mockGenerateMessages
+      false,
+      { generateBundles },
     );
 
     await domLoc.translateRoots();
diff --git a/dom/l10n/tests/mochitest/dom_localization/test_domloc.xhtml b/dom/l10n/tests/mochitest/dom_localization/test_domloc.xhtml
index f642a3467a59..3cf167cce571 100644
--- a/dom/l10n/tests/mochitest/dom_localization/test_domloc.xhtml
+++ b/dom/l10n/tests/mochitest/dom_localization/test_domloc.xhtml
@@ -10,7 +10,7 @@
   <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
   <script type="application/javascript">
   <![CDATA[
-  async function * generateMessages(resourceIds) {
+  async function* generateBundles(resourceIds) {
     const bundle = new FluentBundle("en-US");
     bundle.addResource(new FluentResource(`
 file-menu =
@@ -29,7 +29,8 @@ container = Some text with an <image data-l10n-name="foo"> inside it.
 
   const domLoc = new DOMLocalization(
     [],
-    generateMessages
+    false,
+    { generateBundles },
   );
 
   async function foo() {
diff --git a/dom/l10n/tests/mochitest/dom_localization/test_getAttributes.html b/dom/l10n/tests/mochitest/dom_localization/test_getAttributes.html
index e302879a90f9..c0fdf960266f 100644
--- a/dom/l10n/tests/mochitest/dom_localization/test_getAttributes.html
+++ b/dom/l10n/tests/mochitest/dom_localization/test_getAttributes.html
@@ -8,14 +8,15 @@
   <script type="application/javascript">
   "use strict";
 
-  async function* mockGenerateMessages(resourceIds) {}
+  async function* generateBundles(resourceIds) {}
 
   window.onload = function() {
     SimpleTest.waitForExplicitFinish();
 
     const domLoc = new DOMLocalization(
       [],
-      mockGenerateMessages
+      false,
+      { generateBundles },
     );
 
     const p1 = document.querySelectorAll("p")[0];
diff --git a/dom/l10n/tests/mochitest/dom_localization/test_l10n_mutations.html b/dom/l10n/tests/mochitest/dom_localization/test_l10n_mutations.html
index 5c5380ea2ab2..e29e5f347a3a 100644
--- a/dom/l10n/tests/mochitest/dom_localization/test_l10n_mutations.html
+++ b/dom/l10n/tests/mochitest/dom_localization/test_l10n_mutations.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
-  async function* mockGenerateMessages(resourceIds) {
+  async function* generateBundles(resourceIds) {
     const bundle = new FluentBundle("en-US");
     bundle.addResource(new FluentResource("title = Hello World"));
     bundle.addResource(new FluentResource("title2 = Hello Another World"));
@@ -19,7 +19,8 @@
 
     const domLoc = new DOMLocalization(
       [],
-      mockGenerateMessages
+      false,
+      { generateBundles },
     );
 
     const h1 = document.querySelectorAll("h1")[0];
diff --git a/dom/l10n/tests/mochitest/dom_localization/test_overlay.html b/dom/l10n/tests/mochitest/dom_localization/test_overlay.html
index 2c1fa635bd96..8127e1ba2ec7 100644
--- a/dom/l10n/tests/mochitest/dom_localization/test_overlay.html
+++ b/dom/l10n/tests/mochitest/dom_localization/test_overlay.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
-  async function* mockGenerateMessages(resourceIds) {
+  async function* generateBundles(resourceIds) {
     const bundle = new FluentBundle("en-US");
     bundle.addResource(new FluentResource("title = <strong>Hello</strong> World"));
     bundle.addResource(new FluentResource(`title2 = This is <a data-l10n-name="link">a link</a>!`));
@@ -19,7 +19,8 @@
 
     const domLoc = new DOMLocalization(
       [],
-      mockGenerateMessages
+      false,
+      { generateBundles },
     );
 
     const p1 = document.querySelectorAll("p")[0];
diff --git a/dom/l10n/tests/mochitest/dom_localization/test_overlay_missing_all.html b/dom/l10n/tests/mochitest/dom_localization/test_overlay_missing_all.html
index e30131242208..2200fe7ea6fa 100644
--- a/dom/l10n/tests/mochitest/dom_localization/test_overlay_missing_all.html
+++ b/dom/l10n/tests/mochitest/dom_localization/test_overlay_missing_all.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
-  async function* mockGenerateMessages(resourceIds) {
+  async function* generateBundles(resourceIds) {
     const bundle = new FluentBundle("en-US");
     // No translations!
     yield bundle;
@@ -17,7 +17,8 @@
   addLoadEvent(async () => {
     const domLoc = new DOMLocalization(
       [],
-      mockGenerateMessages
+      false,
+      { generateBundles },
     );
 
     await domLoc.translateFragment(document.body).then(() => {
diff --git a/dom/l10n/tests/mochitest/dom_localization/test_overlay_missing_children.html b/dom/l10n/tests/mochitest/dom_localization/test_overlay_missing_children.html
index 7c24edb4a7b7..20d58ba630e3 100644
--- a/dom/l10n/tests/mochitest/dom_localization/test_overlay_missing_children.html
+++ b/dom/l10n/tests/mochitest/dom_localization/test_overlay_missing_children.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
-  async function* mockGenerateMessages(resourceIds) {
+  async function* generateBundles(resourceIds) {
     const bundle = new FluentBundle("en-US");
     bundle.addResource(new FluentResource(`title = Visit <a data-l10n-name="mozilla-link">Mozilla</a> or <a data-l10n-name="firefox-link">Firefox</a> website!`));
     yield bundle;
@@ -18,7 +18,8 @@
 
     const domLoc = new DOMLocalization(
       [],
-      mockGenerateMessages
+      false,
+      { generateBundles },
     );
 
     await domLoc.translateFragment(document.body);
diff --git a/dom/l10n/tests/mochitest/dom_localization/test_overlay_repeated.html b/dom/l10n/tests/mochitest/dom_localization/test_overlay_repeated.html
index 8bccf6f7345b..2d202b2e7f61 100644
--- a/dom/l10n/tests/mochitest/dom_localization/test_overlay_repeated.html
+++ b/dom/l10n/tests/mochitest/dom_localization/test_overlay_repeated.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
-  async function* mockGenerateMessages(resourceIds) {
+  async function* generateBundles(resourceIds) {
     const bundle = new FluentBundle("en-US");
     bundle.addResource(new FluentResource(`title = Visit <a data-l10n-name="mozilla-link">Mozilla</a> or <a data-l10n-name="firefox-link">Firefox</a> website!`));
     yield bundle;
@@ -18,7 +18,8 @@
 
     const domLoc = new DOMLocalization(
       [],
-      mockGenerateMessages
+      false,
+      { generateBundles },
     );
 
     await domLoc.translateFragment(document.body);
diff --git a/dom/l10n/tests/mochitest/dom_localization/test_overlay_sanitized.html b/dom/l10n/tests/mochitest/dom_localization/test_overlay_sanitized.html
index 57fa654953fb..74472e88b043 100644
--- a/dom/l10n/tests/mochitest/dom_localization/test_overlay_sanitized.html
+++ b/dom/l10n/tests/mochitest/dom_localization/test_overlay_sanitized.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
-  async function* mockGenerateMessages(resourceIds) {
+  async function* generateBundles(resourceIds) {
     const bundle = new FluentBundle("en-US");
     bundle.addResource(new FluentResource(`
 key1 =
@@ -22,7 +22,8 @@ key2 =
   async function test() {
     const domLoc = new DOMLocalization(
       [],
-      mockGenerateMessages
+      false,
+      { generateBundles },
     );
 
     await domLoc.translateFragment(document.body);
diff --git a/dom/l10n/tests/mochitest/dom_localization/test_repeated_l10nid.html b/dom/l10n/tests/mochitest/dom_localization/test_repeated_l10nid.html
index 372fc7029bb9..5ac848c03379 100644
--- a/dom/l10n/tests/mochitest/dom_localization/test_repeated_l10nid.html
+++ b/dom/l10n/tests/mochitest/dom_localization/test_repeated_l10nid.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
-  async function* mockGenerateMessages(resourceIds) {
+  async function* generateBundles(resourceIds) {
     const bundle = new FluentBundle("en-US");
     bundle.addResource(new FluentResource(`
 key1 = Translation For Key 1
@@ -21,7 +21,8 @@ key2 = Visit <a data-l10n-name="link">this link<a/>.
   addLoadEvent(async () => {
     const domLoc = new DOMLocalization(
       [],
-      mockGenerateMessages
+      false,
+      { generateBundles },
     );
 
     await domLoc.translateFragment(document.body);
diff --git a/dom/l10n/tests/mochitest/dom_localization/test_setAttributes.html b/dom/l10n/tests/mochitest/dom_localization/test_setAttributes.html
index dcbc3cb2d704..1c4d93c2e74c 100644
--- a/dom/l10n/tests/mochitest/dom_localization/test_setAttributes.html
+++ b/dom/l10n/tests/mochitest/dom_localization/test_setAttributes.html
@@ -8,14 +8,15 @@
   <script type="application/javascript">
   "use strict";
 
-  async function* mockGenerateMessages(resourceIds) {}
+  async function* generateBundles(resourceIds) {}
 
   window.onload = function() {
     SimpleTest.waitForExplicitFinish();
 
     const domLoc = new DOMLocalization(
       [],
-      mockGenerateMessages
+      false,
+      { generateBundles },
     );
 
     const p1 = document.querySelectorAll("p")[0];
diff --git a/dom/l10n/tests/mochitest/dom_localization/test_translateElements.html b/dom/l10n/tests/mochitest/dom_localization/test_translateElements.html
index 693998ce9f6c..20bc015a662b 100644
--- a/dom/l10n/tests/mochitest/dom_localization/test_translateElements.html
+++ b/dom/l10n/tests/mochitest/dom_localization/test_translateElements.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
-  async function* mockGenerateMessages(resourceIds) {
+  async function* generateBundles(resourceIds) {
     const bundle = new FluentBundle("en-US");
     bundle.addResource(new FluentResource("title = Hello World"));
     bundle.addResource(new FluentResource("link =\n    .title = Click me"));
@@ -19,7 +19,8 @@
 
     const domLoc = new DOMLocalization(
       [],
-      mockGenerateMessages
+      false,
+      { generateBundles },
     );
 
     const p1 = document.querySelectorAll("p")[0];
diff --git a/dom/l10n/tests/mochitest/dom_localization/test_translateFragment.html b/dom/l10n/tests/mochitest/dom_localization/test_translateFragment.html
index f951bcbcbeec..8f592bbfb7e1 100644
--- a/dom/l10n/tests/mochitest/dom_localization/test_translateFragment.html
+++ b/dom/l10n/tests/mochitest/dom_localization/test_translateFragment.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
-  async function* mockGenerateMessages(resourceIds) {
+  async function* generateBundles(resourceIds) {
     const bundle = new FluentBundle("en-US");
     bundle.addResource(new FluentResource("title = Hello World"));
     bundle.addResource(new FluentResource("subtitle = Welcome to FluentBundle"));
@@ -19,7 +19,8 @@
 
     const domLoc = new DOMLocalization(
       [],
-      mockGenerateMessages
+      false,
+      { generateBundles },
     );
 
     const frag = document.querySelectorAll("div")[0];
diff --git a/dom/l10n/tests/mochitest/dom_localization/test_translateRoots.html b/dom/l10n/tests/mochitest/dom_localization/test_translateRoots.html
index 085f4656b7d6..1daba8c5ae9a 100644
--- a/dom/l10n/tests/mochitest/dom_localization/test_translateRoots.html
+++ b/dom/l10n/tests/mochitest/dom_localization/test_translateRoots.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
-  async function* mockGenerateMessages(resourceIds) {
+  async function* generateBundles(resourceIds) {
     const bundle = new FluentBundle("en-US");
     bundle.addResource(new FluentResource("title = Hello World"));
     bundle.addResource(new FluentResource("title2 = Hello Another World"));
@@ -19,7 +19,8 @@
 
     const domLoc = new DOMLocalization(
       [],
-      mockGenerateMessages
+      false,
+      { generateBundles },
     );
 
     const frag1 = document.querySelectorAll("div")[0];
diff --git a/dom/l10n/tests/mochitest/l10n_mutations/test_disconnectedRoot_webcomponent.html b/dom/l10n/tests/mochitest/l10n_mutations/test_disconnectedRoot_webcomponent.html
index 1b6933ea2aa8..be6d501c7efe 100644
--- a/dom/l10n/tests/mochitest/l10n_mutations/test_disconnectedRoot_webcomponent.html
+++ b/dom/l10n/tests/mochitest/l10n_mutations/test_disconnectedRoot_webcomponent.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
-  async function* mockGenerateMessages(resourceIds) {
+  async function* generateBundles(resourceIds) {
     const bundle = new FluentBundle("en-US");
     bundle.addResource(new FluentResource(`
 key1 = Key 1
@@ -20,7 +20,8 @@ key4 = Key 4
 
   document.domLoc = new DOMLocalization(
     [],
-    mockGenerateMessages
+    false,
+    { generateBundles }
   );
   document.domLoc.connectRoot(document.documentElement);
   </script>
diff --git a/intl/l10n/test/mochitest/localization/test_formatMessages.html b/intl/l10n/test/mochitest/localization/test_formatMessages.html
index e55aa32ad0a5..f682f696d528 100644
--- a/intl/l10n/test/mochitest/localization/test_formatMessages.html
+++ b/intl/l10n/test/mochitest/localization/test_formatMessages.html
@@ -8,7 +8,7 @@
   <script type="application/javascript">
   "use strict";
 
-  async function* mockGenerateMessages(resourceIds) {
+  async function* generateBundles(resourceIds) {
     const bundle = new FluentBundle("en-US", {
       useIsolating: false,
     });
@@ -31,7 +31,8 @@ key2 =
 
     const loc = new Localization(
       ['mock.ftl'],
-      mockGenerateMessages,
+      false,
+      { generateBundles },
     );
 
     {
diff --git a/intl/l10n/test/mochitest/localization/test_formatValue.html b/intl/l10n/test/mochitest/localization/test_formatValue.html
index b786072bf84c..7517f7b59640 100644
--- a/intl/l10n/test/mochitest/localization/test_formatValue.html
+++ b/intl/l10n/test/mochitest/localization/test_formatValue.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
-  async function* mockGenerateMessages(resourceIds) {
+  async function* generateBundles(resourceIds) {
     const bundle = new FluentBundle("en-US", {
       useIsolating: false,
     });
@@ -24,7 +24,8 @@ key3 = Value { $count }
 
     const loc = new Localization(
       ['mock.ftl'],
-      mockGenerateMessages,
+      false,
+      { generateBundles },
     );
 
     {
diff --git a/intl/l10n/test/mochitest/localization/test_formatValues.html b/intl/l10n/test/mochitest/localization/test_formatValues.html
index e33024af9c19..a6758ca977fd 100644
--- a/intl/l10n/test/mochitest/localization/test_formatValues.html
+++ b/intl/l10n/test/mochitest/localization/test_formatValues.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript">
   "use strict";
-  async function* mockGenerateMessages(resourceIds) {
+  async function* generateBundles(resourceIds) {
     const bundle = new FluentBundle("en-US",
     {
       useIsolating: false,
@@ -25,7 +25,8 @@ key3 = Value { $count }
 
     const loc = new Localization(
       ['mock.ftl'],
-      mockGenerateMessages,
+      false,
+      { generateBundles },
     );
 
     {
diff --git a/intl/l10n/test/test_localization.js b/intl/l10n/test/test_localization.js
index cbec36480f7e..0a43d981187b 100644
--- a/intl/l10n/test/test_localization.js
+++ b/intl/l10n/test/test_localization.js
@@ -2,7 +2,6 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 const { AppConstants } = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-const { Localization } = ChromeUtils.import("resource://gre/modules/Localization.jsm");
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 add_task(function test_methods_presence() {
@@ -29,13 +28,13 @@ add_task(async function test_methods_calling() {
   const source = new FileSource("test", ["de", "en-US"], "/localization/{locale}");
   L10nRegistry.registerSource(source);
 
-  async function* generateMessages(resIds) {
+  async function* generateBundles(resIds) {
     yield * await L10nRegistry.generateBundles(["de", "en-US"], resIds);
   }
 
   const l10n = new Localization([
     "/browser/menu.ftl",
-  ], false, generateMessages);
+  ], false, { generateBundles });
 
   let values = await l10n.formatValues([{id: "key"}, {id: "key2"}]);
 
@@ -75,13 +74,13 @@ key = { PLATFORM() ->
   const source = new FileSource("test", ["en-US"], "/localization/{locale}");
   L10nRegistry.registerSource(source);
 
-  async function* generateMessages(resIds) {
+  async function* generateBundles(resIds) {
     yield * await L10nRegistry.generateBundles(["en-US"], resIds);
   }
 
   const l10n = new Localization([
     "/test.ftl",
-  ], false, generateMessages);
+  ], false, { generateBundles });
 
   let values = await l10n.formatValues([{id: "key"}]);
 
@@ -110,11 +109,11 @@ add_task(async function test_add_remove_resourceIds() {
   const source = new FileSource("test", ["en-US"], "/localization/{locale}");
   L10nRegistry.registerSource(source);
 
-  async function* generateMessages(resIds) {
+  async function* generateBundles(resIds) {
     yield * await L10nRegistry.generateBundles(["en-US"], resIds);
   }
 
-  const l10n = new Localization(["/browser/menu.ftl"], false, generateMessages);
+  const l10n = new Localization(["/browser/menu.ftl"], false, { generateBundles });
 
   let values = await l10n.formatValues([{id: "key1"}, {id: "key2"}]);
 
@@ -168,15 +167,15 @@ add_task(async function test_switch_to_async() {
   const source = new FileSource("test", ["en-US"], "/localization/{locale}");
   L10nRegistry.registerSource(source);
 
-  async function* generateMessages(resIds) {
+  async function* generateBundles(resIds) {
     yield * await L10nRegistry.generateBundles(["en-US"], resIds);
   }
 
-  function* generateMessagesSync(resIds) {
+  function* generateBundlesSync(resIds) {
     yield * L10nRegistry.generateBundlesSync(["en-US"], resIds);
   }
 
-  const l10n = new Localization(["/browser/menu.ftl"], false, generateMessages, generateMessagesSync);
+  const l10n = new Localization(["/browser/menu.ftl"], false, { generateBundles, generateBundlesSync });
 
   let values = await l10n.formatValues([{id: "key1"}, {id: "key2"}]);
 
diff --git a/intl/l10n/test/test_localization_sync.js b/intl/l10n/test/test_localization_sync.js
index 560b89735c81..cca967669b81 100644
--- a/intl/l10n/test/test_localization_sync.js
+++ b/intl/l10n/test/test_localization_sync.js
@@ -2,7 +2,6 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 const { AppConstants } = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-const { Localization } = ChromeUtils.import("resource://gre/modules/Localization.jsm");
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 add_task(function test_methods_calling() {
@@ -23,13 +22,13 @@ add_task(function test_methods_calling() {
   const source = new FileSource("test", ["de", "en-US"], "/localization/{locale}");
   L10nRegistry.registerSource(source);
 
-  function* generateMessagesSync(resIds) {
+  function* generateBundlesSync(resIds) {
     yield * L10nRegistry.generateBundlesSync(["de", "en-US"], resIds);
   }
 
   const l10n = new Localization([
     "/browser/menu.ftl",
-  ], true, null, generateMessagesSync);
+  ], true, { generateBundlesSync });
 
   let values = l10n.formatValuesSync([{id: "key"}, {id: "key2"}]);
 
@@ -69,13 +68,13 @@ key = { PLATFORM() ->
   const source = new FileSource("test", ["en-US"], "/localization/{locale}");
   L10nRegistry.registerSource(source);
 
-  function* generateMessagesSync(resIds) {
+  function* generateBundlesSync(resIds) {
     yield * L10nRegistry.generateBundlesSync(["en-US"], resIds);
   }
 
   const l10n = new Localization([
     "/test.ftl",
-  ], true, null, generateMessagesSync);
+  ], true, { generateBundlesSync });
 
   let values = l10n.formatValuesSync([{id: "key"}]);
 
@@ -104,11 +103,11 @@ add_task(function test_add_remove_resourceIds() {
   const source = new FileSource("test", ["en-US"], "/localization/{locale}");
   L10nRegistry.registerSource(source);
 
-  function* generateMessagesSync(resIds) {
+  function* generateBundlesSync(resIds) {
     yield * L10nRegistry.generateBundlesSync(["en-US"], resIds);
   }
 
-  const l10n = new Localization(["/browser/menu.ftl"], true, null, generateMessagesSync);
+  const l10n = new Localization(["/browser/menu.ftl"], true, { generateBundlesSync });
 
   let values = l10n.formatValuesSync([{id: "key1"}, {id: "key2"}]);
 
@@ -148,4 +147,4 @@ add_task(function test_calling_sync_methods_in_async_mode_fails() {
   Assert.throws(() => {
     l10n.formatMessagesSync([{ id: "key1"}]);
   }, /Can't use sync formatWithFallback when state is async./);
-});
\ No newline at end of file
+});
diff --git a/intl/l10n/test/test_pseudo.js b/intl/l10n/test/test_pseudo.js
index fe61228d1e94..2cc8d6cbecc1 100644
--- a/intl/l10n/test/test_pseudo.js
+++ b/intl/l10n/test/test_pseudo.js
@@ -1,7 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-const { Localization } = ChromeUtils.import("resource://gre/modules/Localization.jsm");
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { L10nRegistry, FileSource } =
   ChromeUtils.import("resource://gre/modules/L10nRegistry.jsm");
@@ -46,12 +45,11 @@ function getAttributeByName(attributes, name) {
 add_task(async function test_accented_works() {
   Services.prefs.setStringPref("intl.l10n.pseudo", "");
 
-  let generateMessages = addMockFileSource();
+  let generateBundles = addMockFileSource();
 
   const l10n = new Localization([
     "/browser/menu.ftl",
-  ], false, generateMessages);
-  l10n.registerObservers();
+  ], false, { generateBundles });
 
   {
     // 1. Start with no pseudo
@@ -116,12 +114,11 @@ add_task(async function test_accented_works() {
 add_task(async function test_unavailable_strategy_works() {
   Services.prefs.setStringPref("intl.l10n.pseudo", "");
 
-  let generateMessages = addMockFileSource();
+  let generateBundles = addMockFileSource();
 
   const l10n = new Localization([
     "/browser/menu.ftl",
-  ], false, generateMessages);
-  l10n.registerObservers();
+  ], false, { generateBundles });
 
   {
     // 1. Set unavailable pseudo strategy