Merging upstream version 126.0.

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

2 files changed, 2 insertions, 7 deletions

diff --git a/tools/esmify/map.json b/tools/esmify/map.json
index 04a790d406..0185ae5401 100644
--- a/tools/esmify/map.json
+++ b/tools/esmify/map.json
@@ -263,8 +263,6 @@
   "resource:///modules/policies/ProxyPolicies.jsm": "browser/components/enterprisepolicies/helpers/ProxyPolicies.jsm",
   "resource:///modules/policies/WebsiteFilter.jsm": "browser/components/enterprisepolicies/helpers/WebsiteFilter.jsm",
   "resource:///modules/policies/schema.jsm": "browser/components/enterprisepolicies/schemas/schema.jsm",
-  "resource:///modules/sessionstore/ContentRestore.jsm": "browser/components/sessionstore/ContentRestore.jsm",
-  "resource:///modules/sessionstore/ContentSessionStore.jsm": "browser/components/sessionstore/ContentSessionStore.jsm",
   "resource:///modules/sessionstore/GlobalState.jsm": "browser/components/sessionstore/GlobalState.jsm",
   "resource:///modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm": "browser/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm",
   "resource:///modules/sessionstore/RunState.jsm": "browser/components/sessionstore/RunState.jsm",
@@ -497,7 +495,6 @@
   "resource://gre/modules/ContentPrefStore.jsm": "toolkit/components/contentprefs/ContentPrefStore.jsm",
   "resource://gre/modules/ContentPrefUtils.jsm": "toolkit/components/contentprefs/ContentPrefUtils.jsm",
   "resource://gre/modules/ContextualIdentityService.jsm": "toolkit/components/contextualidentity/ContextualIdentityService.jsm",
-  "resource://gre/modules/Corroborate.jsm": "toolkit/components/corroborator/Corroborate.jsm",
   "resource://gre/modules/CoveragePing.jsm": "toolkit/components/telemetry/pings/CoveragePing.jsm",
   "resource://gre/modules/CrashManager.jsm": "toolkit/components/crashes/CrashManager.in.jsm",
   "resource://gre/modules/CrashMonitor.jsm": "toolkit/components/crashmonitor/CrashMonitor.jsm",
@@ -566,8 +563,8 @@
   "resource://gre/modules/FirefoxRelay.jsm": "toolkit/components/passwordmgr/FirefoxRelay.jsm",
   "resource://gre/modules/FirstStartup.jsm": "toolkit/modules/FirstStartup.jsm",
   "resource://gre/modules/ForgetAboutSite.jsm": "toolkit/components/forgetaboutsite/ForgetAboutSite.jsm",
-  "resource://gre/modules/FormAutoComplete.jsm": "toolkit/components/satchel/FormAutoComplete.jsm",
   "resource://gre/modules/FormHistory.jsm": "toolkit/components/satchel/FormHistory.jsm",
+  "resource://gre/modules/FormAutoComplete.jsm": "toolkit/components/satchel/FormHistoryAutoComplete.jsm",
   "resource://gre/modules/FormHistoryStartup.jsm": "toolkit/components/satchel/FormHistoryStartup.jsm",
   "resource://gre/modules/FormLikeFactory.jsm": "toolkit/modules/FormLikeFactory.jsm",
   "resource://gre/modules/FxAccounts.jsm": "services/fxaccounts/FxAccounts.jsm",
@@ -764,7 +761,6 @@
   "resource://gre/modules/TelemetryStorage.jsm": "toolkit/components/telemetry/app/TelemetryStorage.jsm",
   "resource://gre/modules/TelemetryTimestamps.jsm": "toolkit/components/telemetry/app/TelemetryTimestamps.jsm",
   "resource://gre/modules/TelemetryUtils.jsm": "toolkit/components/telemetry/app/TelemetryUtils.jsm",
-  "resource://gre/modules/TerminatorTelemetry.jsm": "toolkit/components/terminator/TerminatorTelemetry.jsm",
   "resource://gre/modules/Timer.jsm": "toolkit/modules/Timer.jsm",
   "resource://gre/modules/TooltipTextProvider.jsm": "toolkit/components/tooltiptext/TooltipTextProvider.jsm",
   "resource://gre/modules/TrackingDBService.jsm": "toolkit/components/antitracking/TrackingDBService.jsm",
@@ -929,7 +925,6 @@
   "resource://reftest/globals.jsm": "layout/tools/reftest/globals.jsm",
   "resource://reftest/manifest.jsm": "layout/tools/reftest/manifest.jsm",
   "resource://reftest/reftest.jsm": "layout/tools/reftest/reftest.jsm",
-  "resource://report-site-issue/tabExtrasActor.jsm": "browser/extensions/report-site-issue/experimentalAPIs/actors/tabExtrasActor.jsm",
   "resource://services-automation/ServicesAutomation.jsm": "services/automation/ServicesAutomation.jsm",
   "resource://services-common/async.js": "services/common/async.js",
   "resource://services-common/hawkclient.js": "services/common/hawkclient.js",
diff --git a/tools/esmify/use-import-export-declarations.js b/tools/esmify/use-import-export-declarations.js
index fe8c4dd286..60e017645b 100644
--- a/tools/esmify/use-import-export-declarations.js
+++ b/tools/esmify/use-import-export-declarations.js
@@ -111,7 +111,7 @@ function isTopLevel(path) {
   return path.parent.node.type === "Program";
 }
 
-function convertToExport(jscodeshift, path, name) {
+function convertToExport(jscodeshift, path) {
   const e = jscodeshift.exportNamedDeclaration(path.node);
   e.comments = [];
   e.comments = path.node.comments;