tor-browser

commit cafbc725a928519a19c2e20c26a17a44facebc8e
parent 1357beacb4eee1df064e573497758f06871c904e
Author: Atila Butkovits <abutkovits@mozilla.com>
Date:   Thu,  2 Oct 2025 16:30:17 +0300

Revert "Bug 1991836 - Avoid double registration of AMTelemetry observers in test_blocklist_statechange_telemetry.update_softblocked_to_hardblocked. r=rpl" for causing failures at test_blocklist_statechange_telemetry.js

This reverts commit 2d3fc94ccc137213e93b72b4af651538e6a1d009.

Diffstat:
M
toolkit/mozapps/extensions/AddonManager.sys.mjs
 | 
1
-
M
toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_statechange_telemetry.js
 | 
2
+-

2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/toolkit/mozapps/extensions/AddonManager.sys.mjs b/toolkit/mozapps/extensions/AddonManager.sys.mjs
@@ -5342,7 +5342,6 @@ AMTelemetry = {
 
   // NOTE: used by AddonTestUtils.promiseShutdownManager to ensure
   // we can initialize it again in AddonTestUtils.promiseStartupManager.
-  // Also used by test_blocklist_statechange_telemetry.js.
   async uninit() {
     if (!this.telemetrySetupDone) {
       return;
diff --git a/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_statechange_telemetry.js b/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_statechange_telemetry.js
@@ -748,7 +748,7 @@ add_task(async function update_softblocked_to_unblocked() {
 add_task(async function update_softblocked_to_hardblocked() {
   // Re-initialize AMTelemetry to make sure it is listening to the AOM
   // addon events onEnabled.
-  await AMTelemetry.uninit();
+  AMTelemetry.telemetrySetupDone = false;
   AMTelemetry.onStartup();
 
   Services.fog.testResetFOG();