Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 1 insertions, 26 deletions

diff --git a/browser/components/asrouter/tests/unit/CFRMessageProvider.test.js b/browser/components/asrouter/tests/unit/CFRMessageProvider.test.js
index fe6959852c..ec35806d11 100644
--- a/browser/components/asrouter/tests/unit/CFRMessageProvider.test.js
+++ b/browser/components/asrouter/tests/unit/CFRMessageProvider.test.js
@@ -1,32 +1,9 @@
 import { CFRMessageProvider } from "modules/CFRMessageProvider.sys.mjs";
 
-const REGULAR_IDS = [
-  "FACEBOOK_CONTAINER",
-  "GOOGLE_TRANSLATE",
-  "YOUTUBE_ENHANCE",
-  // These are excluded for now.
-  // "WIKIPEDIA_CONTEXT_MENU_SEARCH",
-  // "REDDIT_ENHANCEMENT",
-];
-
 describe("CFRMessageProvider", () => {
   let messages;
   beforeEach(async () => {
     messages = await CFRMessageProvider.getMessages();
   });
-  it("should have a total of 11 messages", () => {
-    assert.lengthOf(messages, 11);
-  });
-  it("should have one message each for the three regular addons", () => {
-    for (const id of REGULAR_IDS) {
-      const cohort3 = messages.find(msg => msg.id === `${id}_3`);
-      assert.ok(cohort3, `contains three day cohort for ${id}`);
-      assert.deepEqual(
-        cohort3.frequency,
-        { lifetime: 3 },
-        "three day cohort has the right frequency cap"
-      );
-      assert.notInclude(cohort3.targeting, `providerCohorts.cfr`);
-    }
-  });
+  it("should have messages", () => assert.ok(messages.length));
 });
diff --git a/browser/components/asrouter/tests/unit/RemoteL10n.test.js b/browser/components/asrouter/tests/unit/RemoteL10n.test.js
index dd0f858750..0e32442522 100644
--- a/browser/components/asrouter/tests/unit/RemoteL10n.test.js
+++ b/browser/components/asrouter/tests/unit/RemoteL10n.test.js
@@ -81,7 +81,6 @@ describe("RemoteL10n", () => {
         "branding/brand.ftl",
         "browser/defaultBrowserNotification.ftl",
         "browser/newtab/asrouter.ftl",
-        "toolkit/branding/accounts.ftl",
         "toolkit/branding/brandings.ftl",
       ]);
       assert.isFalse(args[1]);
@@ -103,7 +102,6 @@ describe("RemoteL10n", () => {
         "branding/brand.ftl",
         "browser/defaultBrowserNotification.ftl",
         "browser/newtab/asrouter.ftl",
-        "toolkit/branding/accounts.ftl",
         "toolkit/branding/brandings.ftl",
       ]);
       assert.isFalse(args[1]);