commit e0b12d066f899efddc3cc0502f1dff30eda9ab33 parent c28e16054c2b0ebaebd35352dcdc368e8c69a224 Author: serge-sans-paille <sguelton@mozilla.com> Date: Thu, 30 Oct 2025 12:24:38 +0000 Bug 1997163 - Remove unused mfbt inclusion in toolkit/** r=emilio,application-update-reviewers,credential-management-reviewers,win-reviewers,toolkit-telemetry-reviewers,bytesized,gstoll,dimi Differential Revision: https://phabricator.services.mozilla.com/D270574 Diffstat:
81 files changed, 4 insertions(+), 83 deletions(-)
diff --git a/mfbt/Saturate.h b/mfbt/Saturate.h @@ -226,6 +226,8 @@ typedef detail::Saturate<int32_t> SaturateInt32; typedef detail::Saturate<uint8_t> SaturateUint8; typedef detail::Saturate<uint16_t> SaturateUint16; typedef detail::Saturate<uint32_t> SaturateUint32; +typedef detail::Saturate<intptr_t> SaturateIntPtr; +typedef detail::Saturate<uintptr_t> SaturateUintPtr; } // namespace mozilla diff --git a/toolkit/components/antitracking/ContentBlockingLog.cpp b/toolkit/components/antitracking/ContentBlockingLog.cpp @@ -26,7 +26,6 @@ #include "mozilla/StaticPrefs_telemetry.h" #include "mozilla/StaticPtr.h" #include "mozilla/glean/AntitrackingMetrics.h" -#include "mozilla/XorShift128PlusRNG.h" namespace mozilla { diff --git a/toolkit/components/antitracking/DynamicFpiNavigationHeuristic.h b/toolkit/components/antitracking/DynamicFpiNavigationHeuristic.h @@ -7,7 +7,6 @@ #ifndef mozilla_dynamicfpinavigationheuristic_h #define mozilla_dynamicfpinavigationheuristic_h -#include "mozilla/WeakPtr.h" #include "nsIEffectiveTLDService.h" #include "nsIPrincipal.h" #include "nsIWebProgressListener.h" diff --git a/toolkit/components/antitracking/StorageAccess.h b/toolkit/components/antitracking/StorageAccess.h @@ -10,7 +10,6 @@ #include <cstdint> #include "mozilla/MozPromise.h" -#include "mozilla/RefPtr.h" #include "mozilla/dom/BrowsingContext.h" diff --git a/toolkit/components/backgroundhangmonitor/HangAnnotations.h b/toolkit/components/backgroundhangmonitor/HangAnnotations.h @@ -13,7 +13,6 @@ #include "mozilla/HangTypes.h" #include "mozilla/MemoryReporting.h" #include "mozilla/Mutex.h" -#include "mozilla/Vector.h" #include "nsString.h" #include "nsTArray.h" diff --git a/toolkit/components/backgroundhangmonitor/HangDetails.h b/toolkit/components/backgroundhangmonitor/HangDetails.h @@ -13,7 +13,6 @@ #include "mozilla/HangAnnotations.h" #include "mozilla/HangTypes.h" #include "mozilla/ProcessedStack.h" -#include "mozilla/RefPtr.h" #include "mozilla/Result.h" #include "mozilla/TimeStamp.h" #include "nsIFile.h" diff --git a/toolkit/components/backgroundhangmonitor/ThreadStackHelper.cpp b/toolkit/components/backgroundhangmonitor/ThreadStackHelper.cpp @@ -20,7 +20,6 @@ #include "mozilla/BasePrincipal.h" #include "mozilla/HangTypes.h" #include "mozilla/IntegerPrintfMacros.h" -#include "mozilla/MemoryChecking.h" #include "mozilla/Sprintf.h" #include "nsThread.h" diff --git a/toolkit/components/backgroundtasks/BackgroundTasksRunner.cpp b/toolkit/components/backgroundtasks/BackgroundTasksRunner.cpp @@ -14,8 +14,6 @@ # include "mozilla/AssembleCmdLine.h" #endif -#include "mozilla/ResultVariant.h" - namespace mozilla { NS_IMPL_ISUPPORTS(BackgroundTasksRunner, nsIBackgroundTasksRunner); diff --git a/toolkit/components/contentanalysis/ContentAnalysis.cpp b/toolkit/components/contentanalysis/ContentAnalysis.cpp @@ -11,7 +11,6 @@ #include "base/process_util.h" #include "GMPUtils.h" // ToHexString #include "MainThreadUtils.h" -#include "mozilla/Array.h" #include "mozilla/Components.h" #include "mozilla/dom/BrowserParent.h" #include "mozilla/dom/CanonicalBrowsingContext.h" diff --git a/toolkit/components/contentanalysis/ContentAnalysis.h b/toolkit/components/contentanalysis/ContentAnalysis.h @@ -6,7 +6,6 @@ #ifndef mozilla_contentanalysis_h #define mozilla_contentanalysis_h -#include "mozilla/MoveOnlyFunction.h" #include "mozilla/MozPromise.h" #include "mozilla/dom/BrowsingContext.h" #include "mozilla/dom/MaybeDiscarded.h" diff --git a/toolkit/components/contentanalysis/ContentAnalysisIPCTypes.h b/toolkit/components/contentanalysis/ContentAnalysisIPCTypes.h @@ -10,7 +10,6 @@ #include "ipc/EnumSerializer.h" #include "ipc/IPCMessageUtilsSpecializations.h" #include "js/PropertyAndElement.h" -#include "mozilla/Variant.h" #include "nsIContentAnalysis.h" #include "mozilla/RefPtr.h" #include "nsHashtablesFwd.h" diff --git a/toolkit/components/extensions/ExtensionPolicyService.cpp b/toolkit/components/extensions/ExtensionPolicyService.cpp @@ -11,7 +11,6 @@ #include "mozilla/BasePrincipal.h" #include "mozilla/ClearOnShutdown.h" #include "mozilla/Preferences.h" -#include "mozilla/ResultExtensions.h" #include "mozilla/Services.h" #include "mozilla/SimpleEnumerator.h" #include "mozilla/StaticPrefs_extensions.h" diff --git a/toolkit/components/extensions/ExtensionPolicyService.h b/toolkit/components/extensions/ExtensionPolicyService.h @@ -6,7 +6,6 @@ #ifndef mozilla_ExtensionPolicyService_h #define mozilla_ExtensionPolicyService_h -#include "mozilla/MemoryReporting.h" #include "mozilla/extensions/WebExtensionPolicy.h" #include "mozIExtensionProcessScript.h" #include "nsCOMPtr.h" diff --git a/toolkit/components/extensions/ExtensionsParent.cpp b/toolkit/components/extensions/ExtensionsParent.cpp @@ -8,7 +8,6 @@ #include "mozilla/dom/BrowsingContext.h" #include "mozilla/dom/ContentParent.h" #include "mozilla/dom/ScriptSettings.h" -#include "mozilla/RefPtr.h" #include "jsapi.h" #include "js/PropertyAndElement.h" // JS_SetProperty #include "nsImportModule.h" diff --git a/toolkit/components/extensions/MatchPattern.h b/toolkit/components/extensions/MatchPattern.h @@ -17,7 +17,6 @@ #include "mozilla/ClearOnShutdown.h" #include "mozilla/Likely.h" #include "mozilla/Maybe.h" -#include "mozilla/RefCounted.h" #include "nsCOMPtr.h" #include "nsCycleCollectionParticipant.h" #include "nsTArray.h" diff --git a/toolkit/components/extensions/WebExtensionPolicy.h b/toolkit/components/extensions/WebExtensionPolicy.h @@ -18,7 +18,6 @@ #include "jspubtd.h" #include "mozilla/Result.h" -#include "mozilla/WeakPtr.h" #include "nsCOMPtr.h" #include "nsCycleCollectionParticipant.h" #include "nsGkAtoms.h" diff --git a/toolkit/components/extensions/webrequest/ChannelWrapper.cpp b/toolkit/components/extensions/webrequest/ChannelWrapper.cpp @@ -19,7 +19,6 @@ #include "mozilla/ClearOnShutdown.h" #include "mozilla/Components.h" #include "mozilla/ErrorNames.h" -#include "mozilla/ResultExtensions.h" #include "mozilla/Try.h" #include "mozilla/dom/Element.h" #include "mozilla/dom/Event.h" diff --git a/toolkit/components/extensions/webrequest/StreamFilterChild.h b/toolkit/components/extensions/webrequest/StreamFilterChild.h @@ -11,7 +11,6 @@ #include "mozilla/extensions/PStreamFilterChild.h" #include "mozilla/extensions/StreamFilter.h" -#include "mozilla/LinkedList.h" #include "mozilla/dom/StreamFilterBinding.h" #include "nsISupportsImpl.h" diff --git a/toolkit/components/extensions/webrequest/StreamFilterParent.h b/toolkit/components/extensions/webrequest/StreamFilterParent.h @@ -10,7 +10,6 @@ #include "StreamFilterBase.h" #include "mozilla/extensions/PStreamFilterParent.h" -#include "mozilla/LinkedList.h" #include "mozilla/Mutex.h" #include "mozilla/WebRequestService.h" #include "nsIStreamListener.h" diff --git a/toolkit/components/extensions/webrequest/WebNavigationContent.cpp b/toolkit/components/extensions/webrequest/WebNavigationContent.cpp @@ -16,7 +16,6 @@ #include "mozilla/extensions/ExtensionsChild.h" #include "mozilla/EventListenerManager.h" #include "mozilla/RefPtr.h" -#include "mozilla/ResultExtensions.h" #include "mozilla/Services.h" #include "mozilla/Try.h" #include "nsCRT.h" diff --git a/toolkit/components/extensions/webrequest/WebRequestService.h b/toolkit/components/extensions/webrequest/WebRequestService.h @@ -7,7 +7,6 @@ #ifndef mozilla_WebRequestService_h #define mozilla_WebRequestService_h -#include "mozilla/LinkedList.h" #include "mozilla/UniquePtr.h" #include "mozilla/extensions/ChannelWrapper.h" diff --git a/toolkit/components/formautofill/FormAutofillNative.cpp b/toolkit/components/formautofill/FormAutofillNative.cpp @@ -16,7 +16,6 @@ #include "mozilla/dom/HTMLLabelElement.h" #include "mozilla/dom/HTMLOptionElement.h" #include "mozilla/dom/HTMLSelectElement.h" -#include "mozilla/HashTable.h" #include "mozilla/RustRegex.h" #include "nsContentUtils.h" #include "nsIFrame.h" diff --git a/toolkit/components/glean/bindings/private/Ping.h b/toolkit/components/glean/bindings/private/Ping.h @@ -9,7 +9,6 @@ #include "mozilla/DataMutex.h" #include "mozilla/glean/fog_ffi_generated.h" -#include "mozilla/Maybe.h" #include "nsIGleanPing.h" #include "nsString.h" diff --git a/toolkit/components/glean/ipc/FOGIPC.h b/toolkit/components/glean/ipc/FOGIPC.h @@ -8,7 +8,6 @@ #include <functional> -#include "mozilla/Maybe.h" #include "mozilla/MozPromise.h" #include "nsTArrayForwardDeclare.h" diff --git a/toolkit/components/glean/tests/gtest/TestFog.cpp b/toolkit/components/glean/tests/gtest/TestFog.cpp @@ -9,7 +9,6 @@ #include "mozilla/glean/GleanPings.h" #include "mozilla/glean/fog_ffi_generated.h" #include "mozilla/Maybe.h" -#include "mozilla/Result.h" #include "mozilla/ResultVariant.h" #include "mozilla/TimeStamp.h" #include "../../bindings/private/Common.h" diff --git a/toolkit/components/ml/MLUtils.cpp b/toolkit/components/ml/MLUtils.cpp @@ -9,7 +9,6 @@ #include <algorithm> #include <cmath> #include "prsystem.h" -#include "mozilla/Casting.h" #include <sys/types.h> #include "nsSystemInfo.h" diff --git a/toolkit/components/ml/backends/llama/LlamaRunner.cpp b/toolkit/components/ml/backends/llama/LlamaRunner.cpp @@ -18,7 +18,6 @@ #include "nsXPCOM.h" #include "prsystem.h" #include "mozilla/Casting.h" -#include "mozilla/SPSCQueue.h" #include <cstddef> #include "mozilla/dom/Promise.h" diff --git a/toolkit/components/ml/backends/llama/LlamaRunner.h b/toolkit/components/ml/backends/llama/LlamaRunner.h @@ -33,7 +33,6 @@ #include "nsThreadUtils.h" #include "mozilla/TaskQueue.h" -#include "mozilla/ScopeExit.h" #include "mozilla/RefPtr.h" #include "nsIThread.h" #include "nsError.h" diff --git a/toolkit/components/places/SQLFunctions.cpp b/toolkit/components/places/SQLFunctions.cpp @@ -19,7 +19,6 @@ #include "nsINavHistoryService.h" #include "nsPrintfCString.h" #include "nsNavHistory.h" -#include "mozilla/Likely.h" #include "mozilla/Services.h" #include "mozilla/Utf8.h" #include "nsURLHelper.h" diff --git a/toolkit/components/places/tests/gtest/mock_Link.h b/toolkit/components/places/tests/gtest/mock_Link.h @@ -11,7 +11,6 @@ #ifndef mock_Link_h__ #define mock_Link_h__ -#include "mozilla/MemoryReporting.h" #include "mozilla/dom/Link.h" #include "mozilla/StaticPrefs_layout.h" diff --git a/toolkit/components/processtools/ProcInfo_bsd.cpp b/toolkit/components/processtools/ProcInfo_bsd.cpp @@ -7,7 +7,6 @@ #include "mozilla/ProcInfo.h" #include "mozilla/Sprintf.h" #include "mozilla/Logging.h" -#include "mozilla/ScopeExit.h" #include "mozilla/ipc/GeckoChildProcessHost.h" #include "nsMemoryReporterManager.h" #include "nsWhitespaceTokenizer.h" diff --git a/toolkit/components/processtools/ProcInfo_solaris.cpp b/toolkit/components/processtools/ProcInfo_solaris.cpp @@ -7,7 +7,6 @@ #include "mozilla/ProcInfo.h" #include "mozilla/Sprintf.h" #include "mozilla/Logging.h" -#include "mozilla/ScopeExit.h" #include "mozilla/ipc/GeckoChildProcessHost.h" #include "nsMemoryReporterManager.h" #include "nsWhitespaceTokenizer.h" diff --git a/toolkit/components/remote/nsDBusRemoteClient.h b/toolkit/components/remote/nsDBusRemoteClient.h @@ -8,7 +8,6 @@ #ifdef MOZ_ENABLE_DBUS # include <gio/gio.h> -# include "mozilla/RefPtr.h" # include "mozilla/GRefPtr.h" #endif #include "nsRemoteClient.h" diff --git a/toolkit/components/remote/nsDBusRemoteServer.cpp b/toolkit/components/remote/nsDBusRemoteServer.cpp @@ -11,7 +11,6 @@ #include "nsAppRunner.h" #include "mozilla/XREAppData.h" #include "mozilla/Base64.h" -#include "mozilla/ScopeExit.h" #include "mozilla/GUniquePtr.h" #include "MainThreadUtils.h" #include "nsPrintfCString.h" diff --git a/toolkit/components/resistfingerprinting/nsRFPService.cpp b/toolkit/components/resistfingerprinting/nsRFPService.cpp @@ -34,7 +34,6 @@ #include "mozilla/Likely.h" #include "mozilla/Logging.h" #include "mozilla/LookAndFeel.h" -#include "mozilla/MacroForEach.h" #include "mozilla/OriginAttributes.h" #include "mozilla/Preferences.h" #include "mozilla/ProfilerMarkers.h" diff --git a/toolkit/components/resistfingerprinting/nsUserCharacteristics.cpp b/toolkit/components/resistfingerprinting/nsUserCharacteristics.cpp @@ -20,7 +20,6 @@ #include "jsapi.h" #include "mozilla/Components.h" #include "mozilla/dom/Promise-inl.h" -#include "mozilla/Variant.h" #include "mozilla/StaticPrefs_browser.h" #include "mozilla/StaticPrefs_dom.h" diff --git a/toolkit/components/sessionstore/BrowserSessionStore.cpp b/toolkit/components/sessionstore/BrowserSessionStore.cpp @@ -14,7 +14,6 @@ #include "mozilla/ClearOnShutdown.h" #include "mozilla/IntegerRange.h" #include "mozilla/RefPtr.h" -#include "mozilla/ScopeExit.h" #include "mozilla/StaticPtr.h" #include "mozilla/dom/BrowserSessionStoreBinding.h" diff --git a/toolkit/components/sessionstore/SessionStoreChangeListener.h b/toolkit/components/sessionstore/SessionStoreChangeListener.h @@ -22,7 +22,6 @@ #include "mozilla/EnumSet.h" #include "mozilla/RefPtr.h" -#include "mozilla/Result.h" #include "mozilla/dom/WindowGlobalChild.h" diff --git a/toolkit/components/sessionstore/SessionStoreChild.cpp b/toolkit/components/sessionstore/SessionStoreChild.cpp @@ -9,7 +9,6 @@ #include "mozilla/AlreadyAddRefed.h" #include "mozilla/Assertions.h" #include "mozilla/RefPtr.h" -#include "mozilla/ScopeExit.h" #include "mozilla/dom/BrowserChild.h" #include "mozilla/dom/BrowsingContext.h" #include "mozilla/dom/InProcessChild.h" diff --git a/toolkit/components/sessionstore/SessionStoreFormData.cpp b/toolkit/components/sessionstore/SessionStoreFormData.cpp @@ -7,7 +7,6 @@ #include "mozilla/dom/SessionStoreFormData.h" #include "mozilla/Assertions.h" -#include "mozilla/ScopeExit.h" #include "mozilla/dom/BindingUtils.h" #include "mozilla/dom/BrowserSessionStoreBinding.h" #include "mozilla/dom/BrowsingContext.h" diff --git a/toolkit/components/sessionstore/SessionStoreParent.cpp b/toolkit/components/sessionstore/SessionStoreParent.cpp @@ -10,7 +10,6 @@ #include "mozilla/Assertions.h" #include "mozilla/Maybe.h" #include "mozilla/RefPtr.h" -#include "mozilla/ScopeExit.h" #include "mozilla/dom/BrowserParent.h" #include "mozilla/dom/BrowserSessionStore.h" #include "mozilla/dom/BrowserSessionStoreBinding.h" diff --git a/toolkit/components/sessionstore/SessionStoreScrollData.cpp b/toolkit/components/sessionstore/SessionStoreScrollData.cpp @@ -10,7 +10,6 @@ #include "js/PropertyAndElement.h" #include "js/TypeDecls.h" #include "mozilla/Assertions.h" -#include "mozilla/RefPtr.h" #include "mozilla/dom/BindingUtils.h" #include "mozilla/dom/BrowserSessionStoreBinding.h" #include "mozilla/dom/BrowsingContext.h" diff --git a/toolkit/components/sessionstore/SessionStoreUtils.cpp b/toolkit/components/sessionstore/SessionStoreUtils.cpp @@ -45,7 +45,6 @@ #include "mozilla/dom/XPathExpression.h" #include "mozilla/dom/PBackgroundSessionStorageCache.h" #include "mozilla/ipc/BackgroundUtils.h" -#include "mozilla/ReverseIterator.h" #include "mozilla/UniquePtr.h" #include "nsCharSeparatedTokenizer.h" #include "nsContentList.h" diff --git a/toolkit/components/telemetry/core/Telemetry.cpp b/toolkit/components/telemetry/core/Telemetry.cpp @@ -37,7 +37,6 @@ #include "mozilla/FStream.h" #include "mozilla/IOInterposer.h" #include "mozilla/Likely.h" -#include "mozilla/MathAlgorithms.h" #include "mozilla/MemoryReporting.h" #include "mozilla/MemoryTelemetry.h" #include "mozilla/ModuleUtils.h" diff --git a/toolkit/components/telemetry/core/Telemetry.h b/toolkit/components/telemetry/core/Telemetry.h @@ -6,7 +6,6 @@ #ifndef Telemetry_h__ #define Telemetry_h__ -#include "mozilla/Maybe.h" #include "mozilla/TelemetryEventEnums.h" #include "mozilla/TelemetryHistogramEnums.h" #include "mozilla/TelemetryScalarEnums.h" diff --git a/toolkit/components/telemetry/core/TelemetryHistogram.cpp b/toolkit/components/telemetry/core/TelemetryHistogram.cpp @@ -17,7 +17,6 @@ #include "js/PropertyAndElement.h" // JS_DefineElement, JS_DefineFunction, JS_DefineProperty, JS_DefineUCProperty, JS_Enumerate, JS_GetElement, JS_GetProperty, JS_GetPropertyById #include "mozilla/dom/ToJSValue.h" #include "mozilla/gfx/GPUProcessManager.h" -#include "mozilla/JSONWriter.h" #include "mozilla/StartupTimeline.h" #include "mozilla/StaticMutex.h" #include "nsClassHashtable.h" diff --git a/toolkit/components/telemetry/core/TelemetryScalar.cpp b/toolkit/components/telemetry/core/TelemetryScalar.cpp @@ -10,7 +10,6 @@ #include "js/Array.h" // JS::GetArrayLength, JS::IsArrayObject #include "js/PropertyAndElement.h" // JS_DefineProperty, JS_DefineUCProperty, JS_Enumerate, JS_GetElement, JS_GetProperty, JS_GetPropertyById, JS_HasProperty #include "mozilla/dom/ContentParent.h" -#include "mozilla/JSONWriter.h" #include "mozilla/Preferences.h" #include "mozilla/StaticMutex.h" #include "mozilla/StaticPtr.h" diff --git a/toolkit/components/telemetry/other/UntrustedModulesDataSerializer.h b/toolkit/components/telemetry/other/UntrustedModulesDataSerializer.h @@ -9,7 +9,6 @@ #include "js/TypeDecls.h" #include "mozilla/UntrustedModulesData.h" -#include "mozilla/Vector.h" #include "nsTHashMap.h" #include "UntrustedModulesBackupService.h" diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/templates/cpp/UniFFIScaffolding.cpp b/toolkit/components/uniffi-bindgen-gecko-js/src/templates/cpp/UniFFIScaffolding.cpp @@ -6,7 +6,6 @@ #include "nsString.h" #include "nsPrintfCString.h" #include "mozilla/Logging.h" -#include "mozilla/Maybe.h" #include "mozilla/StaticPtr.h" #include "mozilla/dom/Promise.h" #include "mozilla/dom/PromiseNativeHandler.h" diff --git a/toolkit/components/uniffi-js/Call.h b/toolkit/components/uniffi-js/Call.h @@ -7,7 +7,6 @@ #ifndef mozilla_UniFFICall_h #define mozilla_UniFFICall_h -#include "mozilla/RefPtr.h" #include "mozilla/UniquePtr.h" #include "mozilla/dom/UniFFIBindingFwd.h" #include "mozilla/dom/UniFFIScaffolding.h" diff --git a/toolkit/components/uniffi-js/Callbacks.cpp b/toolkit/components/uniffi-js/Callbacks.cpp @@ -12,7 +12,6 @@ #include "mozilla/dom/Promise.h" #include "mozilla/dom/UniFFIBinding.h" #include "mozilla/uniffi/Callbacks.h" -#include "mozilla/Maybe.h" #include "mozilla/Logging.h" #include "mozilla/RefPtr.h" #include "mozilla/UniquePtr.h" diff --git a/toolkit/components/uniffi-js/FfiValue.h b/toolkit/components/uniffi-js/FfiValue.h @@ -10,7 +10,6 @@ #include <limits> #include <type_traits> #include "nsString.h" -#include "mozilla/ResultVariant.h" #include "mozilla/dom/PrimitiveConversions.h" #include "mozilla/dom/TypedArray.h" #include "mozilla/dom/UniFFIBinding.h" diff --git a/toolkit/components/uniffi-js/ResultPromise.h b/toolkit/components/uniffi-js/ResultPromise.h @@ -9,7 +9,6 @@ #include "nsThreadUtils.h" #include "mozilla/MozPromise.h" -#include "mozilla/RefPtr.h" #include "mozilla/UniquePtr.h" #include "mozilla/dom/Promise.h" #include "mozilla/dom/UniFFIBinding.h" diff --git a/toolkit/components/url-classifier/LookupCache.h b/toolkit/components/url-classifier/LookupCache.h @@ -15,7 +15,6 @@ #include "nsUrlClassifierPrefixSet.h" #include "VariableLengthPrefixSet.h" #include "mozilla/Logging.h" -#include "mozilla/TypedEnumBits.h" #include "nsIUrlClassifierInfo.h" namespace mozilla { diff --git a/toolkit/components/url-classifier/UrlClassifierTelemetryUtils.cpp b/toolkit/components/url-classifier/UrlClassifierTelemetryUtils.cpp @@ -3,7 +3,6 @@ * * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "UrlClassifierTelemetryUtils.h" -#include "mozilla/Assertions.h" namespace mozilla { namespace safebrowsing { diff --git a/toolkit/components/url-classifier/UrlClassifierTelemetryUtils.h b/toolkit/components/url-classifier/UrlClassifierTelemetryUtils.h @@ -6,7 +6,6 @@ #ifndef UrlClassifierTelemetryUtils_h__ #define UrlClassifierTelemetryUtils_h__ -#include "mozilla/TypedEnumBits.h" #include "nsISupportsImpl.h" namespace mozilla { diff --git a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.h b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.h @@ -14,7 +14,6 @@ #include "nsTArray.h" #include "mozilla/FileUtils.h" #include "mozilla/Mutex.h" -#include "mozilla/Poison.h" class nsIInputStream; class nsIOutputStream; diff --git a/toolkit/components/viaduct/ViaductRequest.cpp b/toolkit/components/viaduct/ViaductRequest.cpp @@ -6,7 +6,6 @@ #include "mozilla/ClearOnShutdown.h" #include "mozilla/ErrorNames.h" -#include "mozilla/ResultExtensions.h" #include "mozilla/ScopeExit.h" #include "mozilla/Services.h" #include "mozilla/Try.h" diff --git a/toolkit/components/windowwatcher/nsWindowWatcher.cpp b/toolkit/components/windowwatcher/nsWindowWatcher.cpp @@ -63,7 +63,6 @@ #include "mozilla/CheckedInt.h" #include "mozilla/NullPrincipal.h" #include "mozilla/Preferences.h" -#include "mozilla/ResultExtensions.h" #include "mozilla/StaticPrefs_browser.h" #include "mozilla/StaticPrefs_middlemouse.h" #include "mozilla/StaticPrefs_full_screen_api.h" diff --git a/toolkit/components/windowwatcher/nsWindowWatcher.h b/toolkit/components/windowwatcher/nsWindowWatcher.h @@ -14,7 +14,6 @@ #include "nsCOMPtr.h" #include "Units.h" #include "mozilla/Mutex.h" -#include "mozilla/Maybe.h" #include "nsIWindowCreator.h" // for stupid compilers #include "nsIWindowWatcher.h" #include "nsIOpenWindowInfo.h" diff --git a/toolkit/library/nsDllMain.cpp b/toolkit/library/nsDllMain.cpp @@ -6,7 +6,6 @@ #include <windows.h> #include "nsToolkit.h" #include "mozilla/Assertions.h" -#include "mozilla/WindowsVersion.h" #if defined(__GNUC__) // If DllMain gets name mangled, it won't be seen. diff --git a/toolkit/mozapps/defaultagent/DefaultBrowser.cpp b/toolkit/mozapps/defaultagent/DefaultBrowser.cpp @@ -14,7 +14,6 @@ #include "Registry.h" #include "mozilla/RefPtr.h" -#include "mozilla/Try.h" #include "mozilla/WinHeaderOnlyUtils.h" namespace mozilla::default_agent { diff --git a/toolkit/mozapps/defaultagent/Policy.cpp b/toolkit/mozapps/defaultagent/Policy.cpp @@ -16,7 +16,6 @@ #include "json/json.h" #include "mozilla/HelperMacros.h" -#include "mozilla/Maybe.h" #include "mozilla/WinHeaderOnlyUtils.h" // There is little logging or error handling in this file, because the file and diff --git a/toolkit/mozapps/defaultagent/tests/gtest/CacheTest.cpp b/toolkit/mozapps/defaultagent/tests/gtest/CacheTest.cpp @@ -12,7 +12,6 @@ #include "Registry.h" #include "UtfConvert.h" -#include "mozilla/Result.h" #include "mozilla/WinHeaderOnlyUtils.h" using namespace mozilla::default_agent; diff --git a/toolkit/mozapps/extensions/AddonManagerStartup.h b/toolkit/mozapps/extensions/AddonManagerStartup.h @@ -7,7 +7,6 @@ #define AddonManagerStartup_h #include "amIAddonManagerStartup.h" -#include "mozilla/Result.h" #include "nsCOMArray.h" #include "nsCOMPtr.h" #include "nsIFile.h" diff --git a/toolkit/mozapps/update/updater/macos-frameworks/UpdateSettings/UpdateSettings.mm b/toolkit/mozapps/update/updater/macos-frameworks/UpdateSettings/UpdateSettings.mm @@ -4,8 +4,6 @@ #include "UpdateSettings.h" -#include "mozilla/HelperMacros.h" - NSString* UpdateSettingsGetAcceptedMARChannels(void) { return [NSString stringWithFormat:@"[Settings]\nACCEPTED_MAR_CHANNEL_IDS=%s\n", diff --git a/toolkit/xre/Bootstrap.h b/toolkit/xre/Bootstrap.h @@ -12,7 +12,6 @@ #ifndef mozilla_Bootstrap_h #define mozilla_Bootstrap_h -#include "mozilla/Maybe.h" #include "mozilla/ResultVariant.h" #include "mozilla/UniquePtr.h" #include "mozilla/UniquePtrExtensions.h" diff --git a/toolkit/xre/CmdLineAndEnvUtils.h b/toolkit/xre/CmdLineAndEnvUtils.h @@ -17,7 +17,6 @@ #if defined(XP_WIN) # include "mozilla/UniquePtr.h" -# include "mozilla/Vector.h" # include "mozilla/WinHeaderOnlyUtils.h" # include <wchar.h> diff --git a/toolkit/xre/DllPrefetchExperimentRegistryInfo.h b/toolkit/xre/DllPrefetchExperimentRegistryInfo.h @@ -7,7 +7,6 @@ #ifndef mozilla_DllPrefetchExperimentRegistryInfo_h #define mozilla_DllPrefetchExperimentRegistryInfo_h -#include "mozilla/Maybe.h" #include "mozilla/WinHeaderOnlyUtils.h" #include "nsWindowsHelpers.h" diff --git a/toolkit/xre/dllservices/UntrustedModulesProcessor.cpp b/toolkit/xre/dllservices/UntrustedModulesProcessor.cpp @@ -22,7 +22,6 @@ #include "mozilla/RDDChild.h" #include "mozilla/RDDParent.h" #include "mozilla/RDDProcessManager.h" -#include "mozilla/ScopeExit.h" #include "mozilla/Services.h" #include "mozilla/Telemetry.h" #include "ModuleEvaluator.h" diff --git a/toolkit/xre/dllservices/UntrustedModulesProcessor.h b/toolkit/xre/dllservices/UntrustedModulesProcessor.h @@ -14,7 +14,6 @@ #include "mozilla/MozPromise.h" #include "mozilla/RefPtr.h" #include "mozilla/UntrustedModulesData.h" -#include "mozilla/Vector.h" #include "mozilla/WinHeaderOnlyUtils.h" #include "nsCOMPtr.h" #include "nsIObserver.h" diff --git a/toolkit/xre/dllservices/mozglue/Authenticode.h b/toolkit/xre/dllservices/mozglue/Authenticode.h @@ -7,7 +7,6 @@ #ifndef mozilla_Authenticode_h #define mozilla_Authenticode_h -#include "mozilla/Maybe.h" #include "mozilla/TypedEnumBits.h" #include "mozilla/UniquePtr.h" diff --git a/toolkit/xre/dllservices/mozglue/WindowsBCryptInitialization.cpp b/toolkit/xre/dllservices/mozglue/WindowsBCryptInitialization.cpp @@ -6,7 +6,6 @@ #include "mozilla/WindowsBCryptInitialization.h" -#include "mozilla/RandomNum.h" #include "nsWindowsDllInterceptor.h" #include <bcrypt.h> diff --git a/toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp b/toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp @@ -18,7 +18,6 @@ #include "mozilla/StackWalk_windows.h" #include "mozilla/TimeStamp.h" #include "mozilla/UniquePtr.h" -#include "mozilla/Vector.h" #include "mozilla/WindowsProcessMitigations.h" #include "mozilla/WindowsVersion.h" #include "mozilla/WinHeaderOnlyUtils.h" diff --git a/toolkit/xre/dllservices/mozglue/interceptor/Arm64.h b/toolkit/xre/dllservices/mozglue/interceptor/Arm64.h @@ -138,7 +138,7 @@ MFBT_API LoadOrBranch BUncondImmDecode(const uintptr_t aPC, */ inline static bool IsVeneerRequired(const uintptr_t aPC, const uintptr_t aTarget) { - detail::Saturate<intptr_t> saturated(aTarget); + SaturateIntPtr saturated(aTarget); saturated -= aPC; uintptr_t absDiff = Abs(saturated.value()); @@ -152,7 +152,7 @@ inline static bool IsUnconditionalBranchImm(const uint32_t aInst) { inline static Maybe<uint32_t> BuildUnconditionalBranchImm( const uintptr_t aPC, const uintptr_t aTarget) { - detail::Saturate<intptr_t> saturated(aTarget); + SaturateIntPtr saturated(aTarget); saturated -= aPC; CheckedInt<int32_t> offset(saturated.value()); diff --git a/toolkit/xre/dllservices/mozglue/interceptor/MMPolicies.h b/toolkit/xre/dllservices/mozglue/interceptor/MMPolicies.h @@ -13,7 +13,6 @@ #include "mozilla/MathAlgorithms.h" #include "mozilla/Maybe.h" #include "mozilla/Span.h" -#include "mozilla/TypedEnumBits.h" #include "mozilla/WindowsMapRemoteView.h" #include "mozilla/WindowsUnwindInfo.h" diff --git a/toolkit/xre/dllservices/mozglue/nsWindowsDllInterceptor.h b/toolkit/xre/dllservices/mozglue/nsWindowsDllInterceptor.h @@ -18,7 +18,6 @@ #include "mozilla/Attributes.h" #include "mozilla/NativeNt.h" -#include "mozilla/Vector.h" #include "mozilla/interceptor/MMPolicies.h" #include "mozilla/interceptor/PatcherDetour.h" #include "mozilla/interceptor/PatcherNopSpace.h" diff --git a/toolkit/xre/dllservices/tests/gtest/TestDLLBlocklist.cpp b/toolkit/xre/dllservices/tests/gtest/TestDLLBlocklist.cpp @@ -14,7 +14,6 @@ #include "gtest/gtest.h" -#include "mozilla/Char16.h" #include "mozilla/gtest/MozAssertions.h" #include "mozilla/Services.h" #include "mozilla/WinDllServices.h" diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp @@ -34,7 +34,6 @@ #include "mozilla/glean/SecuritySandboxMetrics.h" #include "mozilla/Telemetry.h" #include "mozilla/Try.h" -#include "mozilla/Utf8.h" #include "mozilla/intl/LocaleService.h" #include "mozilla/JSONWriter.h" #include "mozilla/gfx/gfxVars.h" diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp @@ -21,7 +21,6 @@ # include <shobjidl.h> # include "mozilla/ipc/WindowsMessageLoop.h" # ifdef MOZ_SANDBOX -# include "mozilla/RandomNum.h" # endif # include "mozilla/ScopeExit.h" # include "mozilla/WinDllServices.h" diff --git a/toolkit/xre/nsUpdateMutex.cpp b/toolkit/xre/nsUpdateMutex.cpp @@ -7,7 +7,6 @@ #include "nsUpdateMutex.h" #include "mozilla/DebugOnly.h" -#include "mozilla/ScopeExit.h" #include "mozilla/StaticMutex.h" #include "nsIFile.h" #include "nsProfileLock.h"