Backed out changeset 27451e8e8c20 (bug 1956952) bc failures @browser_glean_sidebar.js. CLOSED TREE

browser/components/sidebar/metrics.yaml

@@ -687,24 +687,3 @@ contextual_manager:
       opened:
         type: boolean
         description: Whether the sidebar is opening.
-  sidebar_customize_enabled:
-    type: event
-    description: >
-      User clicked on the checkbox corresponding to the "Passwords" entry on sidebar customization settings.
-    bugs:
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=1956952
-    data_reviews:
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=1947634
-    data_sensitivity:
-      - interaction
-    expires: never
-    notification_emails:
-      - issozi@mozilla.com
-      - tthorne@mozilla.com
-      - passwords-dev@mozilla.org
-    send_in_pings:
-      - events
-    extra_keys:
-      checked:
-        type: boolean
-        description: Whether the Passwords box was checked.

browser/components/sidebar/sidebar-customize.mjs

@@ -153,11 +153,6 @@ export class SidebarCustomize extends SidebarPage {
           checked: e.target.checked,
         });
         break;
-      case "viewCPMSidebar":
-        Glean.contextualManager.sidebarCustomizeEnabled.record({
-          checked: e.target.checked,
-        });
-        break;
     }
   }
 

browser/components/sidebar/tests/browser/browser_glean_sidebar.js

@@ -249,7 +249,10 @@ add_task(async function test_review_checker_sidebar_toggle() {
 
 add_task(async function test_contextual_manager_toggle() {
   await SpecialPowers.pushPrefEnv({
-    set: [["browser.contextual-password-manager.enabled", true]],
+    set: [
+      ["browser.contextual-password-manager.enabled", true],
+      ["sidebar.revamp", false],
+    ],
   });
   await SidebarController.waitUntilStable();
   const gleanEvent = Glean.contextualManager.sidebarToggle;
@@ -258,20 +261,6 @@ add_task(async function test_contextual_manager_toggle() {
   await SidebarController.waitUntilStable();
 });
 
-add_task(async function test_customize_contextual_manager_enabled() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["browser.contextual-password-manager.enabled", true]],
-  });
-  await testCustomizeToggle(
-    "viewCPMSidebar",
-    Glean.contextualManager.sidebarCustomizeEnabled,
-    false
-  );
-  await SpecialPowers.popPrefEnv();
-  await SidebarController.waitUntilStable();
-  Services.fog.testResetFOG();
-});
-
 add_task(async function test_customize_panel_toggle() {
   await testSidebarToggle(
     "viewCustomizeSidebar",