From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:35:49 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- browser/components/doh/DoHConfig.sys.mjs | 2 +- .../components/doh/test/browser/browser_remoteSettings_newProfile.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'browser/components/doh') diff --git a/browser/components/doh/DoHConfig.sys.mjs b/browser/components/doh/DoHConfig.sys.mjs index 5d35940d55..f9ac5f0f40 100644 --- a/browser/components/doh/DoHConfig.sys.mjs +++ b/browser/components/doh/DoHConfig.sys.mjs @@ -196,7 +196,7 @@ export const DoHConfigController = { return; } - Services.obs.addObserver(function obs(sub, top, data) { + Services.obs.addObserver(function obs() { Services.obs.removeObserver(obs, lazy.Region.REGION_TOPIC); updateRegionAndResolve(); }, lazy.Region.REGION_TOPIC); diff --git a/browser/components/doh/test/browser/browser_remoteSettings_newProfile.js b/browser/components/doh/test/browser/browser_remoteSettings_newProfile.js index cd4356ed3f..c41fa66abe 100644 --- a/browser/components/doh/test/browser/browser_remoteSettings_newProfile.js +++ b/browser/components/doh/test/browser/browser_remoteSettings_newProfile.js @@ -13,7 +13,7 @@ async function setPrefAndWaitForConfigFlush(pref, value) { await configFlushedPromise; } -async function clearPrefAndWaitForConfigFlush(pref, value) { +async function clearPrefAndWaitForConfigFlush(pref) { let configFlushedPromise = DoHTestUtils.waitForConfigFlush(); Preferences.reset(pref); await configFlushedPromise; -- cgit v1.2.3