Bug 1792574, part 3 - Don't include nsMemory where it isn't needed. r=xpcom-reviewers,necko-reviewers,valentin,nika

There are only 3 places where nsMemory.h is still needed (image/RasterImage.cpp, gfx/thebes/gfxFT2FontList.cpp, and nsMemory.cpp). Remove the rest. Differential Revision: https://phabricator.services.mozilla.com/D158213
2022-09-28 15:17:46 +00:00 · 2022-09-28 15:17:46 +00:00 · 2da84b8ac4
--- a/caps/NullPrincipal.cpp
+++ b/caps/NullPrincipal.cpp
@ -18,7 +18,6 @@
 #include "NullPrincipal.h"
 #include "DefaultURI.h"
 #include "nsSimpleURI.h"
-#include "nsMemory.h"
 #include "nsIClassInfoImpl.h"
 #include "nsNetCID.h"
 #include "nsError.h"
--- a/caps/nsJSPrincipals.cpp
+++ b/caps/nsJSPrincipals.cpp
@ -9,7 +9,6 @@
 #include "nsJSPrincipals.h"
 #include "plstr.h"
 #include "nsCOMPtr.h"
-#include "nsMemory.h"
 #include "nsStringBuffer.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/StaticPtr.h"
--- a/devtools/platform/JSDebugger.cpp
+++ b/devtools/platform/JSDebugger.cpp
@ -10,7 +10,6 @@
 #include "jsfriendapi.h"
 #include "js/Wrapper.h"
 #include "nsServiceManagerUtils.h"
-#include "nsMemory.h"

 #define JSDEBUGGER_CONTRACTID "@mozilla.org/jsdebugger;1"

--- a/dom/base/DOMException.cpp
+++ b/dom/base/DOMException.cpp
@ -13,7 +13,6 @@
 #include "nsCOMPtr.h"
 #include "mozilla/dom/Document.h"
 #include "nsIException.h"
-#include "nsMemory.h"
 #include "xpcprivate.h"

 #include "mozilla/dom/DOMExceptionBinding.h"
--- a/dom/base/nsTextFragment.cpp
+++ b/dom/base/nsTextFragment.cpp
@ -13,7 +13,6 @@
 #include "nsTextFragment.h"
 #include "nsCRT.h"
 #include "nsReadableUtils.h"
-#include "nsMemory.h"
 #include "nsBidiUtils.h"
 #include "nsUnicharUtils.h"
 #include "mozilla/CheckedInt.h"
--- a/dom/events/EventListenerService.cpp
+++ b/dom/events/EventListenerService.cpp
@ -18,7 +18,6 @@
 #include "nsCOMArray.h"
 #include "nsINode.h"
 #include "nsJSUtils.h"
-#include "nsMemory.h"
 #include "nsServiceManagerUtils.h"
 #include "nsArray.h"
 #include "nsThreadUtils.h"
--- a/dom/file/MemoryBlobImpl.cpp
+++ b/dom/file/MemoryBlobImpl.cpp
@ -9,7 +9,6 @@
 #include "mozilla/IntegerPrintfMacros.h"
 #include "mozilla/SHA1.h"
 #include "nsIMemoryReporter.h"
-#include "nsMemory.h"
 #include "nsPrintfCString.h"
 #include "nsRFPService.h"
 #include "nsStringStream.h"
--- a/dom/media/webspeech/recognition/OnlineSpeechRecognitionService.cpp
+++ b/dom/media/webspeech/recognition/OnlineSpeechRecognitionService.cpp
@ -21,7 +21,6 @@
 #include "mozilla/Services.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
-#include "nsMemory.h"
 #include "nsNetUtil.h"
 #include "nsContentUtils.h"
 #include "nsIChannel.h"
--- a/dom/offline/nsDOMOfflineResourceList.cpp
+++ b/dom/offline/nsDOMOfflineResourceList.cpp
@ -8,7 +8,6 @@
 #include "nsError.h"
 #include "mozilla/Components.h"
 #include "mozilla/dom/DOMStringList.h"
-#include "nsMemory.h"
 #include "nsNetUtil.h"
 #include "nsNetCID.h"
 #include "nsServiceManagerUtils.h"
--- a/dom/xslt/xpath/txNodeSet.cpp
+++ b/dom/xslt/xpath/txNodeSet.cpp
@ -5,7 +5,6 @@

 #include "txNodeSet.h"
 #include "txLog.h"
-#include "nsMemory.h"
 #include "txXPathTreeWalker.h"
 #include <algorithm>

--- a/dom/xslt/xslt/txMozillaXSLTProcessor.cpp
+++ b/dom/xslt/xslt/txMozillaXSLTProcessor.cpp
@ -10,7 +10,6 @@
 #include "mozilla/dom/Document.h"
 #include "nsIStringBundle.h"
 #include "nsIURI.h"
-#include "nsMemory.h"
 #include "XPathResult.h"
 #include "txExecutionState.h"
 #include "txMozillaTextOutput.h"
--- a/editor/libeditor/InsertNodeTransaction.cpp
+++ b/editor/libeditor/InsertNodeTransaction.cpp
@ -17,7 +17,6 @@
 #include "nsDebug.h"          // for NS_WARNING, etc.
 #include "nsError.h"          // for NS_ERROR_NULL_POINTER, etc.
 #include "nsIContent.h"       // for nsIContent
-#include "nsMemory.h"         // for nsMemory
 #include "nsReadableUtils.h"  // for ToNewCString
 #include "nsString.h"         // for nsString

--- a/editor/spellchecker/EditorSpellCheck.cpp
+++ b/editor/spellchecker/EditorSpellCheck.cpp
@ -37,7 +37,6 @@
 #include "nsThreadUtils.h"     // for GetMainThreadSerialEventTarget
 #include "nsVariant.h"         // for nsIWritableVariant, etc
 #include "nsLiteralString.h"   // for NS_LITERAL_STRING, etc
-#include "nsMemory.h"          // for nsMemory
 #include "nsRange.h"
 #include "nsReadableUtils.h"        // for ToNewUnicode, EmptyString, etc
 #include "nsServiceManagerUtils.h"  // for do_GetService
--- a/extensions/auth/nsAuthGSSAPI.cpp
+++ b/extensions/auth/nsAuthGSSAPI.cpp
@ -18,7 +18,6 @@
 #include "mozilla/IntegerPrintfMacros.h"

 #include "nsCOMPtr.h"
-#include "nsMemory.h"
 #include "nsNativeCharsetUtils.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/SharedLibrary.h"
--- a/extensions/auth/nsAuthSSPI.cpp
+++ b/extensions/auth/nsAuthSSPI.cpp
@ -18,7 +18,6 @@
 #include "nsDNSService2.h"
 #include "nsIDNSService.h"
 #include "nsIDNSRecord.h"
-#include "nsMemory.h"
 #include "nsNetCID.h"
 #include "nsServiceManagerUtils.h"
 #include "nsCOMPtr.h"
--- a/extensions/auth/nsAuthSambaNTLM.cpp
+++ b/extensions/auth/nsAuthSambaNTLM.cpp
@ -5,7 +5,6 @@

 #include "nsAuth.h"
 #include "nsAuthSambaNTLM.h"
-#include "nsMemory.h"
 #include "nspr.h"
 #include "prenv.h"
 #include "plbase64.h"
--- a/extensions/spellcheck/src/mozEnglishWordUtils.cpp
+++ b/extensions/spellcheck/src/mozEnglishWordUtils.cpp
@ -10,7 +10,6 @@
 #include "nsUnicodeProperties.h"
 #include "nsCRT.h"
 #include "mozilla/Likely.h"
-#include "nsMemory.h"

 NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(mozEnglishWordUtils, AddRef)
 NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(mozEnglishWordUtils, Release)
--- a/gfx/src/nsThebesFontEnumerator.cpp
+++ b/gfx/src/nsThebesFontEnumerator.cpp
@ -14,7 +14,6 @@
 #include "nsError.h"              // for NS_OK, NS_FAILED, nsresult
 #include "nsAtom.h"               // for nsAtom, NS_Atomize
 #include "nsID.h"
-#include "nsMemory.h"  // for nsMemory
 #include "nsString.h"  // for nsAutoCString, nsAutoString, etc
 #include "nsTArray.h"  // for nsTArray, nsTArray_Impl, etc
 #include "nscore.h"    // for char16_t, NS_IMETHODIMP
--- a/gfx/thebes/gfxASurface.cpp
+++ b/gfx/thebes/gfxASurface.cpp
@ -4,7 +4,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "nsIMemoryReporter.h"
-#include "nsMemory.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Base64.h"
 #include "mozilla/CheckedInt.h"
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@ -62,8 +62,6 @@
 #include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/gfxVars.h"

-#include "nsMemory.h"
-
 #include <dwmapi.h>
 #include <d3d11.h>
 #include <d2d1_1.h>
--- a/image/decoders/icon/mac/nsIconChannelCocoa.mm
+++ b/image/decoders/icon/mac/nsIconChannelCocoa.mm
@ -15,7 +15,6 @@
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsString.h"
 #include "nsMimeTypes.h"
-#include "nsMemory.h"
 #include "nsIURL.h"
 #include "nsNetCID.h"
 #include "nsIPipe.h"
--- a/image/decoders/icon/win/nsIconChannel.cpp
+++ b/image/decoders/icon/win/nsIconChannel.cpp
@ -22,7 +22,6 @@
 #include "nsString.h"
 #include "nsReadableUtils.h"
 #include "nsMimeTypes.h"
-#include "nsMemory.h"
 #include "nsIURL.h"
 #include "nsIPipe.h"
 #include "nsNetCID.h"
--- a/image/decoders/nsPNGDecoder.cpp
+++ b/image/decoders/nsPNGDecoder.cpp
@ -14,7 +14,6 @@
 #include "gfxPlatform.h"
 #include "imgFrame.h"
 #include "nsColor.h"
-#include "nsMemory.h"
 #include "nsRect.h"
 #include "nspr.h"
 #include "png.h"
--- a/intl/hyphenation/glue/nsHyphenationManager.cpp
+++ b/intl/hyphenation/glue/nsHyphenationManager.cpp
@ -22,7 +22,6 @@
 #include "nsCRT.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
-#include "nsMemory.h"
 #include "nsXULAppAPI.h"

 using namespace mozilla;
--- a/intl/strres/nsStringBundle.cpp
+++ b/intl/strres/nsStringBundle.cpp
@ -12,7 +12,6 @@
 #include "nsStringBundleService.h"
 #include "nsArrayEnumerator.h"
 #include "nscore.h"
-#include "nsMemory.h"
 #include "nsNetUtil.h"
 #include "nsComponentManagerUtils.h"
 #include "nsServiceManagerUtils.h"
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@ -113,7 +113,6 @@
 #include "nsIComponentRegistrar.h"
 #include "nsISupportsPrimitives.h"
 #include "nsISimpleEnumerator.h"
-#include "nsMemory.h"
 #include "nsIXPConnect.h"
 #include "nsIXPCScriptable.h"
 #include "nsIObserver.h"
--- a/js/xpconnect/tests/components/native/xpctest_private.h
+++ b/js/xpconnect/tests/components/native/xpctest_private.h
@ -10,7 +10,6 @@
 #define xpctest_private_h___

 #include "nsISupports.h"
-#include "nsMemory.h"
 #include "nsString.h"
 #include "xpctest_attributes.h"
 #include "xpctest_params.h"
--- a/layout/generic/nsFloatManager.cpp
+++ b/layout/generic/nsFloatManager.cpp
@ -21,7 +21,6 @@
 #include "nsIFrame.h"
 #include "nsIFrameInlines.h"
 #include "nsImageRenderer.h"
-#include "nsMemory.h"

 using namespace mozilla;
 using namespace mozilla::image;
--- a/modules/libjar/zipwriter/nsDeflateConverter.cpp
+++ b/modules/libjar/zipwriter/nsDeflateConverter.cpp
@ -7,7 +7,6 @@
 #include "nsDeflateConverter.h"
 #include "nsStringStream.h"
 #include "nsComponentManagerUtils.h"
-#include "nsMemory.h"
 #include "nsCRT.h"
 #include "plstr.h"
 #include "mozilla/UniquePtr.h"
--- a/modules/libjar/zipwriter/nsZipDataStream.cpp
+++ b/modules/libjar/zipwriter/nsZipDataStream.cpp
@ -10,7 +10,6 @@
 #include "nsDeflateConverter.h"
 #include "nsNetUtil.h"
 #include "nsComponentManagerUtils.h"
-#include "nsMemory.h"

 #define ZIP_METHOD_STORE 0
 #define ZIP_METHOD_DEFLATE 8
--- a/modules/libjar/zipwriter/nsZipHeader.cpp
+++ b/modules/libjar/zipwriter/nsZipHeader.cpp
@ -5,7 +5,6 @@

 #include "StreamFunctions.h"
 #include "nsZipHeader.h"
-#include "nsMemory.h"
 #include "prtime.h"

 #define ZIP_FILE_HEADER_SIGNATURE 0x04034b50
--- a/modules/libjar/zipwriter/nsZipWriter.cpp
+++ b/modules/libjar/zipwriter/nsZipWriter.cpp
@ -13,7 +13,6 @@
 #include "nsIStreamListener.h"
 #include "nsIInputStreamPump.h"
 #include "nsComponentManagerUtils.h"
-#include "nsMemory.h"
 #include "nsError.h"
 #include "nsStreamUtils.h"
 #include "nsThreadUtils.h"
--- a/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
+++ b/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
@ -5,7 +5,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "nsHTTPCompressConv.h"
-#include "nsMemory.h"
 #include "plstr.h"
 #include "nsCOMPtr.h"
 #include "nsCRT.h"
--- a/netwerk/wifi/nsWifiAccessPoint.cpp
+++ b/netwerk/wifi/nsWifiAccessPoint.cpp
@ -4,7 +4,6 @@

 #include "nsWifiAccessPoint.h"
 #include "nsString.h"
-#include "nsMemory.h"
 #include "mozilla/Logging.h"

 extern mozilla::LazyLogModule gWifiMonitorLog;
--- a/parser/html/nsHtml5NamedCharacters.h
+++ b/parser/html/nsHtml5NamedCharacters.h
@ -27,7 +27,6 @@
 #include "nscore.h"
 #include "nsDebug.h"
 #include "mozilla/Logging.h"
-#include "nsMemory.h"

 struct nsHtml5CharacterName {
  uint16_t nameStart;
--- a/parser/html/nsHtml5NamedCharactersAccel.h
+++ b/parser/html/nsHtml5NamedCharactersAccel.h
@ -13,7 +13,6 @@
 #include "nscore.h"
 #include "nsDebug.h"
 #include "mozilla/Logging.h"
-#include "nsMemory.h"

 class nsHtml5NamedCharactersAccel {
 public:
--- a/storage/Variant.h
+++ b/storage/Variant.h
@ -10,7 +10,6 @@
 #include <utility>

 #include "nsIVariant.h"
-#include "nsMemory.h"
 #include "nsString.h"
 #include "nsTArray.h"

--- a/storage/mozStorageArgValueArray.cpp
+++ b/storage/mozStorageArgValueArray.cpp
@ -5,7 +5,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "nsError.h"
-#include "nsMemory.h"
 #include "nsString.h"

 #include "mozStoragePrivateHelpers.h"
--- a/storage/mozStorageAsyncStatement.cpp
+++ b/storage/mozStorageAsyncStatement.cpp
@ -8,7 +8,6 @@
 #include <stdio.h>

 #include "nsError.h"
-#include "nsMemory.h"
 #include "nsProxyRelease.h"
 #include "nsThreadUtils.h"
 #include "nsIClassInfoImpl.h"
--- a/storage/mozStorageAsyncStatementJSHelper.cpp
+++ b/storage/mozStorageAsyncStatementJSHelper.cpp
@ -8,7 +8,6 @@
 #include "mozStorageAsyncStatement.h"
 #include "mozStorageService.h"

-#include "nsMemory.h"
 #include "nsString.h"
 #include "nsServiceManagerUtils.h"

--- a/storage/mozStorageAsyncStatementParams.cpp
+++ b/storage/mozStorageAsyncStatementParams.cpp
@ -7,7 +7,6 @@
 #include "mozStorageAsyncStatementParams.h"

 #include "nsJSUtils.h"
-#include "nsMemory.h"
 #include "nsString.h"

 #include "jsapi.h"
--- a/storage/mozStorageStatement.cpp
+++ b/storage/mozStorageStatement.cpp
@ -8,7 +8,6 @@
 #include <stdio.h>

 #include "nsError.h"
-#include "nsMemory.h"
 #include "nsThreadUtils.h"
 #include "nsIClassInfoImpl.h"
 #include "Variant.h"
--- a/storage/mozStorageStatementJSHelper.cpp
+++ b/storage/mozStorageStatementJSHelper.cpp
@ -8,7 +8,6 @@
 #include "mozStorageStatement.h"
 #include "mozStorageService.h"

-#include "nsMemory.h"
 #include "nsString.h"
 #include "nsServiceManagerUtils.h"

--- a/storage/mozStorageStatementParams.cpp
+++ b/storage/mozStorageStatementParams.cpp
@ -7,7 +7,6 @@
 #include "mozStorageStatementParams.h"

 #include "nsJSUtils.h"
-#include "nsMemory.h"
 #include "nsString.h"

 #include "jsapi.h"
--- a/storage/mozStorageStatementRow.cpp
+++ b/storage/mozStorageStatementRow.cpp
@ -4,7 +4,6 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

-#include "nsMemory.h"
 #include "nsString.h"

 #include "mozilla/ErrorResult.h"
--- a/storage/test/gtest/storage_test_harness.h
+++ b/storage/test/gtest/storage_test_harness.h
@ -14,7 +14,6 @@
 #include "nsComponentManagerUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
-#include "nsMemory.h"
 #include "nsServiceManagerUtils.h"
 #include "nsIThread.h"
 #include "nsThreadUtils.h"
--- a/toolkit/components/places/tests/gtest/places_test_harness.h
+++ b/toolkit/components/places/tests/gtest/places_test_harness.h
@ -5,7 +5,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "gtest/gtest.h"
-#include "nsMemory.h"
 #include "nsThreadUtils.h"
 #include "nsDocShellCID.h"

--- a/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp
+++ b/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp
@ -30,7 +30,6 @@
 #include "nsIObserverService.h"
 #include "nsIPrefBranch.h"
 #include "nsIPrefService.h"
-#include "nsMemory.h"
 #include "nsPIDOMWindow.h"
 #include "nsServiceManagerUtils.h"
 #include "nsThreadManager.h"
--- a/toolkit/xre/MacLaunchHelper.mm
+++ b/toolkit/xre/MacLaunchHelper.mm
@ -7,7 +7,6 @@

 #include "MacAutoreleasePool.h"
 #include "mozilla/UniquePtr.h"
-#include "nsMemory.h"

 #include <Cocoa/Cocoa.h>
 #include <crt_externs.h>
--- a/tools/profiler/gecko/nsProfiler.cpp
+++ b/tools/profiler/gecko/nsProfiler.cpp
@ -32,7 +32,6 @@
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsILoadContext.h"
 #include "nsIWebNavigation.h"
-#include "nsMemory.h"
 #include "nsProfilerStartParams.h"
 #include "nsProxyRelease.h"
 #include "nsString.h"
--- a/uriloader/exthandler/mac/nsOSHelperAppService.mm
+++ b/uriloader/exthandler/mac/nsOSHelperAppService.mm
@ -17,7 +17,6 @@
 #include "nsIFile.h"
 #include "nsILocalFileMac.h"
 #include "nsMimeTypes.h"
-#include "nsMemory.h"
 #include "nsCRT.h"
 #include "nsMIMEInfoMac.h"
 #include "nsEmbedCID.h"
--- a/uriloader/exthandler/nsExternalHelperAppService.cpp
+++ b/uriloader/exthandler/nsExternalHelperAppService.cpp
@ -38,7 +38,6 @@
 #include "nsString.h"
 #include "nsUnicharUtils.h"
 #include "nsIStringEnumerator.h"
-#include "nsMemory.h"
 #include "nsIStreamListener.h"
 #include "nsIMIMEService.h"
 #include "nsILoadGroup.h"
--- a/uriloader/exthandler/nsOSHelperAppServiceChild.cpp
+++ b/uriloader/exthandler/nsOSHelperAppServiceChild.cpp
@ -16,7 +16,6 @@
 #include "nsIHandlerService.h"
 #include "nsMimeTypes.h"
 #include "nsMIMEInfoImpl.h"
-#include "nsMemory.h"
 #include "nsCExternalHandlerService.h"
 #include "nsCRT.h"
 #include "nsEmbedCID.h"
--- a/widget/cocoa/nsClipboard.mm
+++ b/widget/cocoa/nsClipboard.mm
@ -16,7 +16,6 @@
 #include "nsString.h"
 #include "nsISupportsPrimitives.h"
 #include "nsPrimitiveHelpers.h"
-#include "nsMemory.h"
 #include "nsIFile.h"
 #include "nsStringStream.h"
 #include "nsDragService.h"
--- a/widget/gtk/NativeKeyBindings.cpp
+++ b/widget/gtk/NativeKeyBindings.cpp
@ -13,7 +13,6 @@

 #include "NativeKeyBindings.h"
 #include "nsString.h"
-#include "nsMemory.h"
 #include "nsGtkKeyUtils.h"

 #include <gtk/gtk.h>
--- a/widget/gtk/nsFilePicker.cpp
+++ b/widget/gtk/nsFilePicker.cpp
@ -19,7 +19,6 @@
 #include "mozilla/Preferences.h"

 #include "nsArrayEnumerator.h"
-#include "nsMemory.h"
 #include "nsEnumeratorUtils.h"
 #include "nsNetUtil.h"
 #include "nsReadableUtils.h"
--- a/widget/nsTransferable.cpp
+++ b/widget/nsTransferable.cpp
@ -24,7 +24,6 @@ Notes to self:
 #include "nsCOMPtr.h"
 #include "nsXPCOM.h"
 #include "nsISupportsPrimitives.h"
-#include "nsMemory.h"
 #include "nsPrimitiveHelpers.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsDirectoryService.h"
--- a/widget/windows/KeyboardLayout.cpp
+++ b/widget/windows/KeyboardLayout.cpp
@ -18,7 +18,6 @@
 #include "nsGkAtoms.h"
 #include "nsIUserIdleServiceInternal.h"
 #include "nsIWindowsRegKey.h"
-#include "nsMemory.h"
 #include "nsPrintfCString.h"
 #include "nsQuickSort.h"
 #include "nsReadableUtils.h"
--- a/xpcom/base/LogModulePrefWatcher.cpp
+++ b/xpcom/base/LogModulePrefWatcher.cpp
@ -10,7 +10,6 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
 #include "nsIObserverService.h"
-#include "nsMemory.h"
 #include "nsString.h"
 #include "nsXULAppAPI.h"
 #include "base/process_util.h"
--- a/xpcom/build/XPCOM.h
+++ b/xpcom/build/XPCOM.h
@ -27,7 +27,6 @@

 #include "nsError.h"
 #include "nsDebug.h"
-#include "nsMemory.h"

 #include "nsID.h"

--- a/xpcom/ds/nsSupportsPrimitives.cpp
+++ b/xpcom/ds/nsSupportsPrimitives.cpp
@ -5,7 +5,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "nsSupportsPrimitives.h"
-#include "nsMemory.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/IntegerPrintfMacros.h"
 #include "mozilla/Sprintf.h"
--- a/xpcom/ds/nsVariant.cpp
+++ b/xpcom/ds/nsVariant.cpp
@ -11,7 +11,6 @@
 #include "nsCycleCollectionParticipant.h"
 #include "xptinfo.h"
 #include "nsReadableUtils.h"
-#include "nsMemory.h"
 #include "nsString.h"
 #include "nsCRTGlue.h"
 #include "mozilla/FloatingPoint.h"
--- a/xpcom/io/nsLinebreakConverter.cpp
+++ b/xpcom/io/nsLinebreakConverter.cpp
@ -6,7 +6,6 @@

 #include "nsLinebreakConverter.h"

-#include "nsMemory.h"
 #include "nsCRT.h"

 /*----------------------------------------------------------------------------
--- a/xpcom/io/nsLocalFileWin.cpp
+++ b/xpcom/io/nsLocalFileWin.cpp
@ -13,7 +13,6 @@
 #include "mozilla/WinHeaderOnlyUtils.h"

 #include "nsCOMPtr.h"
-#include "nsMemory.h"

 #include "nsLocalFile.h"
 #include "nsLocalFileCommon.h"
--- a/xpcom/io/nsPipe3.cpp
+++ b/xpcom/io/nsPipe3.cpp
@ -22,7 +22,6 @@
 #include "mozilla/Logging.h"
 #include "nsIClassInfoImpl.h"
 #include "nsAlgorithm.h"
-#include "nsMemory.h"
 #include "nsPipe.h"
 #include "nsIAsyncInputStream.h"
 #include "nsIAsyncOutputStream.h"
--- a/xpcom/io/nsScriptableInputStream.cpp
+++ b/xpcom/io/nsScriptableInputStream.cpp
@ -5,7 +5,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "nsScriptableInputStream.h"
-#include "nsMemory.h"
 #include "nsString.h"

 NS_IMPL_ISUPPORTS(nsScriptableInputStream, nsIScriptableInputStream)
--- a/xpcom/io/nsSegmentedBuffer.cpp
+++ b/xpcom/io/nsSegmentedBuffer.cpp
@ -5,7 +5,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "nsSegmentedBuffer.h"
-#include "nsMemory.h"
 #include "nsNetCID.h"
 #include "nsServiceManagerUtils.h"
 #include "nsThreadUtils.h"
--- a/xpcom/io/nsStorageStream.h
+++ b/xpcom/io/nsStorageStream.h
@ -17,7 +17,6 @@

 #include "nsIStorageStream.h"
 #include "nsIOutputStream.h"
-#include "nsMemory.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Mutex.h"

--- a/xpcom/io/nsStringStream.h
+++ b/xpcom/io/nsStringStream.h
@ -9,7 +9,6 @@

 #include "nsIStringStream.h"
 #include "nsString.h"
-#include "nsMemory.h"
 #include "nsTArray.h"

 /**
--- a/xpcom/string/nsReadableUtils.cpp
+++ b/xpcom/string/nsReadableUtils.cpp
@ -12,7 +12,6 @@
 #include "mozilla/Utf8.h"

 #include "nscore.h"
-#include "nsMemory.h"
 #include "nsString.h"
 #include "nsTArray.h"
 #include "nsUTF8Utils.h"
--- a/xpcom/string/nsTextFormatter.cpp
+++ b/xpcom/string/nsTextFormatter.cpp
@ -15,12 +15,6 @@
 *   Daniele Nicolodi  <daniele@grinta.net>
 */

-/*
- * Copied from xpcom/ds/nsTextFormatter.cpp r1.22
- *     Changed to use nsMemory and Frozen linkage
- *                  -- Prasad <prasad@medhas.org>
- */
-
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
@ -29,7 +23,6 @@
 #include "mozilla/Sprintf.h"
 #include "nsCRTGlue.h"
 #include "nsTextFormatter.h"
-#include "nsMemory.h"

 struct nsTextFormatter::SprintfStateStr {
  int (*stuff)(SprintfStateStr* aState, const char16_t* aStr, uint32_t aLen);
--- a/xpcom/tests/gtest/TestDeadlockDetector.cpp
+++ b/xpcom/tests/gtest/TestDeadlockDetector.cpp
@ -10,7 +10,6 @@

 #include "nsCOMPtr.h"
 #include "nsICrashReporter.h"
-#include "nsMemory.h"
 #include "nsServiceManagerUtils.h"
 #include "nsTArray.h"

--- a/xpcom/tests/gtest/TestExpirationTracker.cpp
+++ b/xpcom/tests/gtest/TestExpirationTracker.cpp
@ -8,7 +8,6 @@
 #include <stdio.h>
 #include <prthread.h>
 #include "nsExpirationTracker.h"
-#include "nsMemory.h"
 #include "nsString.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
--- a/xpcom/threads/nsProcessCommon.cpp
+++ b/xpcom/threads/nsProcessCommon.cpp
@ -16,7 +16,6 @@

 #include "nsCOMPtr.h"
 #include "nsIFile.h"
-#include "nsMemory.h"
 #include "nsProcess.h"
 #include "prio.h"
 #include "prenv.h"
--- a/xpcom/threads/nsThreadPool.cpp
+++ b/xpcom/threads/nsThreadPool.cpp
@ -10,7 +10,6 @@
 #include "ThreadDelay.h"
 #include "nsThreadManager.h"
 #include "nsThread.h"
-#include "nsMemory.h"
 #include "nsThreadUtils.h"
 #include "prinrval.h"
 #include "mozilla/Logging.h"