Merging upstream version 126.0.

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

1 files changed, 2 insertions, 110 deletions

diff --git a/browser/components/asrouter/tests/InflightAssetsMessageProvider.sys.mjs b/browser/components/asrouter/tests/InflightAssetsMessageProvider.sys.mjs
index e92b210c12..adb14ecc38 100644
--- a/browser/components/asrouter/tests/InflightAssetsMessageProvider.sys.mjs
+++ b/browser/components/asrouter/tests/InflightAssetsMessageProvider.sys.mjs
@@ -10,58 +10,10 @@ export const InflightAssetsMessageProvider = {
   getMessages() {
     return [
       {
-        id: "MILESTONE_MESSAGE",
-        groups: ["cfr"],
-        content: {
-          anchor_id: "tracking-protection-icon-box",
-          bucket_id: "CFR_MILESTONE_MESSAGE",
-          buttons: {
-            primary: {
-              action: {
-                type: "OPEN_PROTECTION_REPORT",
-              },
-              event: "PROTECTION",
-              label: {
-                string_id: "cfr-doorhanger-milestone-ok-button",
-              },
-            },
-            secondary: [
-              {
-                label: {
-                  string_id: "cfr-doorhanger-milestone-close-button",
-                },
-                action: {
-                  type: "CANCEL",
-                },
-                event: "DISMISS",
-              },
-            ],
-          },
-          category: "cfrFeatures",
-          heading_text: {
-            string_id: "cfr-doorhanger-milestone-heading",
-          },
-          layout: "short_message",
-          notification_text: "",
-          skip_address_bar_notifier: true,
-          text: "",
-        },
-        frequency: {
-          lifetime: 7,
-        },
-        targeting:
-          "pageLoad >= 4 && firefoxVersion < 87 && userPrefs.cfrFeatures",
-        template: "milestone_message",
-        trigger: {
-          id: "contentBlocking",
-          params: ["ContentBlockingMilestone"],
-        },
-      },
-      {
         id: "MILESTONE_MESSAGE_87",
         groups: ["cfr"],
         content: {
-          anchor_id: "tracking-protection-icon-box",
+          anchor_id: "tracking-protection-icon-container",
           bucket_id: "CFR_MILESTONE_MESSAGE",
           buttons: {
             primary: {
@@ -98,7 +50,7 @@ export const InflightAssetsMessageProvider = {
           lifetime: 7,
         },
         targeting:
-          "pageLoad >= 4 && firefoxVersion >= 87 && userPrefs.cfrFeatures",
+          "pageLoad >= 4 && firefoxVersion >= 115 && firefoxVersion < 121 && userPrefs.cfrFeatures",
         template: "milestone_message",
         trigger: {
           id: "contentBlocking",
@@ -275,66 +227,6 @@ export const InflightAssetsMessageProvider = {
           ],
         },
       },
-      {
-        id: "WNP_MOMENTS_12",
-        groups: ["moments-pages"],
-        content: {
-          action: {
-            data: {
-              expire: 1640908800000,
-              url: "https://www.mozilla.org/firefox/welcome/12",
-            },
-            id: "moments-wnp",
-          },
-          bucket_id: "WNP_MOMENTS_12",
-        },
-        targeting:
-          'localeLanguageCode == "en" && region in ["DE", "AT", "BE", "CA", "FR", "IE", "IT", "MY", "NL", "NZ", "SG", "CH", "US", "GB", "ES"]  && (addonsInfo.addons|keys intersect ["@testpilot-containers"])|length == 1 && \'browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features\'|preferenceValue && \'browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons\'|preferenceValue',
-        template: "update_action",
-        trigger: {
-          id: "momentsUpdate",
-        },
-      },
-      {
-        id: "WNP_MOMENTS_13",
-        groups: ["moments-pages"],
-        content: {
-          action: {
-            data: {
-              expire: 1640908800000,
-              url: "https://www.mozilla.org/firefox/welcome/13",
-            },
-            id: "moments-wnp",
-          },
-          bucket_id: "WNP_MOMENTS_13",
-        },
-        targeting:
-          '(localeLanguageCode in ["en", "de", "fr", "nl", "it", "ms"] || locale == "es-ES") && region in ["DE", "AT", "BE", "CA", "FR", "IE", "IT", "MY", "NL", "NZ", "SG", "CH", "US", "GB", "ES"]  && (addonsInfo.addons|keys intersect ["@testpilot-containers"])|length == 0 && \'browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features\'|preferenceValue && \'browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons\'|preferenceValue',
-        template: "update_action",
-        trigger: {
-          id: "momentsUpdate",
-        },
-      },
-      {
-        id: "WNP_MOMENTS_14",
-        groups: ["moments-pages"],
-        content: {
-          action: {
-            data: {
-              expire: 1668470400000,
-              url: "https://www.mozilla.org/firefox/welcome/14",
-            },
-            id: "moments-wnp",
-          },
-          bucket_id: "WNP_MOMENTS_14",
-        },
-        targeting:
-          'localeLanguageCode in ["en", "de", "fr"] && region in ["AT", "BE", "CA", "CH", "DE", "ES", "FI", "FR", "GB", "IE", "IT", "MY", "NL", "NZ", "SE", "SG", "US"]  && \'browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features\'|preferenceValue && \'browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons\'|preferenceValue',
-        template: "update_action",
-        trigger: {
-          id: "momentsUpdate",
-        },
-      },
     ];
   },
 };