Revert "Bug 1963764 - read the correct enterprise policy when deciding whether to hide Report Broken Site (also improve the related tests); r=Gijs" for causing mochitests failures in browser_parent_menuitems.js.

This reverts commit c5c06a5.

Author: sstanca-cell

browser/components/reportbrokensite/ReportBrokenSite.sys.mjs

@@ -455,7 +455,9 @@ export var ReportBrokenSite = new (class ReportBrokenSite {
     // Altering the disabled attribute on the command does not propagate
     // the change to the related menuitems (see bug 805653), so we change them all.
     const cmd = document.getElementById("cmd_reportBrokenSite");
-    const allowedByPolicy = Services.policies.isAllowed("feedbackCommands");
+    const allowedByPolicy = Services.policies.isAllowed(
+      "DisableFeedbackCommands"
+    );
     cmd.toggleAttribute("hidden", !allowedByPolicy);
     const app = document.ownerGlobal.PanelMultiView.getViewNode(
       document,

browser/components/reportbrokensite/test/browser/browser_parent_menuitems.js

@@ -16,73 +16,81 @@ add_task(async function testMenus() {
   ensureReportBrokenSitePreffedOff();
 
   const appMenu = AppMenu();
-  const helpMenu = HelpMenu();
-  const protectionsPanel = ProtectionsPanel();
+  const menus = [appMenu, ProtectionsPanel(), HelpMenu()];
+
+  async function forceMenuItemStateUpdate() {
+    ReportBrokenSite.enableOrDisableMenuitems(window);
 
-  async function ensure(menu, fn, test) {
     // the hidden/disabled state of all of the menuitems may not update until one
     // is rendered; then the related <command>'s state is propagated to them all.
-    await menu.open();
-    await menu.close();
-
-    await menu.open();
-    fn(menu.reportBrokenSite, `${fn.name}(${menu.menuDescription}) ${test} - `);
-    await menu.close();
+    await appMenu.open();
+    await appMenu.close();
   }
 
   await BrowserTestUtils.withNewTab("about:blank", async function () {
-    ReportBrokenSite.enableOrDisableMenuitems(window);
-    const test = "on invalid page when preffed off";
-    await ensure(appMenu, isMenuItemDisabled, test);
-    await ensure(helpMenu, isMenuItemDisabled, test);
-    ensureProtectionsPanelHidden(test);
+    await forceMenuItemStateUpdate();
+    for (const { menuDescription, reportBrokenSite } of menus) {
+      isMenuItemHidden(
+        reportBrokenSite,
+        `${menuDescription} option hidden on invalid page when preffed off`
+      );
+    }
   });
 
   await BrowserTestUtils.withNewTab(REPORTABLE_PAGE_URL, async function () {
-    ReportBrokenSite.enableOrDisableMenuitems(window);
-    const test =
-      "on valid page when preffed off (fallback to original reporter)";
-    await ensure(appMenu, isMenuItemEnabled, test);
-    await ensure(helpMenu, isMenuItemEnabled, test);
-    await ensure(protectionsPanel, isMenuItemEnabled, test);
+    await forceMenuItemStateUpdate();
+    for (const { menuDescription, reportBrokenSite } of menus) {
+      isMenuItemHidden(
+        reportBrokenSite,
+        `${menuDescription} option hidden on valid page when preffed off`
+      );
+    }
   });
 
   ensureReportBrokenSitePreffedOn();
 
   await BrowserTestUtils.withNewTab("about:blank", async function () {
-    ReportBrokenSite.enableOrDisableMenuitems(window);
-    const test = "on invalid page when preffed on";
-    await ensure(appMenu, isMenuItemDisabled, test);
-    await ensure(helpMenu, isMenuItemDisabled, test);
-    ensureProtectionsPanelHidden(test);
+    await forceMenuItemStateUpdate();
+    for (const { menuDescription, reportBrokenSite } of menus) {
+      isMenuItemDisabled(
+        reportBrokenSite,
+        `${menuDescription} option disabled on invalid page when preffed on`
+      );
+    }
   });
 
   await BrowserTestUtils.withNewTab(REPORTABLE_PAGE_URL, async function () {
-    ReportBrokenSite.enableOrDisableMenuitems(window);
-    const test = "on valid page when preffed on";
-    await ensure(appMenu, isMenuItemEnabled, test);
-    await ensure(helpMenu, isMenuItemEnabled, test);
-    await ensure(protectionsPanel, isMenuItemEnabled, test);
+    await forceMenuItemStateUpdate();
+    for (const { menuDescription, reportBrokenSite } of menus) {
+      isMenuItemEnabled(
+        reportBrokenSite,
+        `${menuDescription} option enabled on valid page when preffed on`
+      );
+    }
   });
 
   ensureReportBrokenSitePreffedOff();
 
   await BrowserTestUtils.withNewTab(REPORTABLE_PAGE_URL, async function () {
-    ReportBrokenSite.enableOrDisableMenuitems(window);
-    const test = "still active when pref toggled back off";
-    await ensure(appMenu, isMenuItemEnabled, test);
-    await ensure(helpMenu, isMenuItemEnabled, test);
-    await ensure(protectionsPanel, isMenuItemEnabled, test);
+    await forceMenuItemStateUpdate();
+    for (const { menuDescription, reportBrokenSite } of menus) {
+      isMenuItemHidden(
+        reportBrokenSite,
+        `${menuDescription} option hidden again when pref toggled back off`
+      );
+    }
   });
 
   ensureReportBrokenSitePreffedOn();
   ensureReportBrokenSiteDisabledByPolicy();
 
   await BrowserTestUtils.withNewTab(REPORTABLE_PAGE_URL, async function () {
-    ReportBrokenSite.enableOrDisableMenuitems(window);
-    const test = "when disabled by DisableFeedbackCommands enterprise policy";
-    await ensure(appMenu, isMenuItemHidden, test);
-    await ensure(helpMenu, isMenuItemHidden, test);
-    await ensure(protectionsPanel, isMenuItemHidden, test);
+    await forceMenuItemStateUpdate();
+    for (const { menuDescription, reportBrokenSite } of menus) {
+      isMenuItemHidden(
+        reportBrokenSite,
+        `${menuDescription} option hidden when disabled by DisableFeedbackCommands enterprise policy`
+      );
+    }
   });
 });

browser/components/reportbrokensite/test/browser/head.js

@@ -210,13 +210,6 @@ function ensureReasonRequired() {
   Services.prefs.setIntPref(PREFS.REASON, 2);
 }
 
-function ensureProtectionsPanelHidden(test) {
-  const { hidden } = document.getElementById(
-    "tracking-protection-icon-container"
-  );
-  ok(hidden, `Protections panel disabled ${test}`);
-}
-
 function isMenuItemEnabled(menuItem, itemDesc) {
   ok(!menuItem.hidden, `${itemDesc} menu item is shown`);
   ok(!menuItem.disabled, `${itemDesc} menu item is enabled`);