diff --git a/caps/NullPrincipal.cpp b/caps/NullPrincipal.cpp index 8f49d797b0ec..b6961f0727f8 100644 --- 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" diff --git a/caps/nsJSPrincipals.cpp b/caps/nsJSPrincipals.cpp index a5d91708c1ed..52d41779dee9 100644 --- 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" diff --git a/devtools/platform/JSDebugger.cpp b/devtools/platform/JSDebugger.cpp index f0145ce19ea7..54fde46a54e5 100644 --- 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" diff --git a/dom/base/DOMException.cpp b/dom/base/DOMException.cpp index b218a09fb613..d3e2fc42d3db 100644 --- 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" diff --git a/dom/base/nsTextFragment.cpp b/dom/base/nsTextFragment.cpp index 5efb11c5442a..ffc882cac8d1 100644 --- 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" diff --git a/dom/events/EventListenerService.cpp b/dom/events/EventListenerService.cpp index 9621e43a752d..4336476aa959 100644 --- 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" diff --git a/dom/file/MemoryBlobImpl.cpp b/dom/file/MemoryBlobImpl.cpp index cf622fd71c15..1c48ec0393a7 100644 --- 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" diff --git a/dom/media/webspeech/recognition/OnlineSpeechRecognitionService.cpp b/dom/media/webspeech/recognition/OnlineSpeechRecognitionService.cpp index 0dd85fa40490..e68ccc417ecc 100644 --- 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" diff --git a/dom/offline/nsDOMOfflineResourceList.cpp b/dom/offline/nsDOMOfflineResourceList.cpp index 89ab428becc2..feb010074f23 100644 --- 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" diff --git a/dom/xslt/xpath/txNodeSet.cpp b/dom/xslt/xpath/txNodeSet.cpp index d007f683a49e..60eed8952d3d 100644 --- 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 diff --git a/dom/xslt/xslt/txMozillaXSLTProcessor.cpp b/dom/xslt/xslt/txMozillaXSLTProcessor.cpp index 049bbd511b8c..fd7fb2b9d4eb 100644 --- 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" diff --git a/editor/libeditor/InsertNodeTransaction.cpp b/editor/libeditor/InsertNodeTransaction.cpp index f95d84262ed6..50e6b32653fa 100644 --- 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 diff --git a/editor/spellchecker/EditorSpellCheck.cpp b/editor/spellchecker/EditorSpellCheck.cpp index 818b3ffc8445..0a0eee1e3e61 100644 --- 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 diff --git a/extensions/auth/nsAuthGSSAPI.cpp b/extensions/auth/nsAuthGSSAPI.cpp index b0de8f0bd8ba..fc3c1592f474 100644 --- 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" diff --git a/extensions/auth/nsAuthSSPI.cpp b/extensions/auth/nsAuthSSPI.cpp index 3c051d34bfdb..ce3ecebdcd20 100644 --- 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" diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp index e136d799c11d..5b701f237978 100644 --- 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" diff --git a/extensions/spellcheck/src/mozEnglishWordUtils.cpp b/extensions/spellcheck/src/mozEnglishWordUtils.cpp index a1b249b6344d..3f73c60cd05e 100644 --- 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) diff --git a/gfx/src/nsThebesFontEnumerator.cpp b/gfx/src/nsThebesFontEnumerator.cpp index 7221e6cc0f76..72c308b83e07 100644 --- 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 diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp index f0ff2334bd5d..ed8d9b4e887a 100644 --- 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" diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp index 733baf6c17fd..1305f6a47a93 100644 --- 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 #include #include diff --git a/image/decoders/icon/mac/nsIconChannelCocoa.mm b/image/decoders/icon/mac/nsIconChannelCocoa.mm index 4e06b77611f2..da37dee8b9ec 100644 --- 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" diff --git a/image/decoders/icon/win/nsIconChannel.cpp b/image/decoders/icon/win/nsIconChannel.cpp index f4a094eefb7f..484500866434 100644 --- 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" diff --git a/image/decoders/nsPNGDecoder.cpp b/image/decoders/nsPNGDecoder.cpp index e3e4ef4727e6..afc2762515de 100644 --- 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" diff --git a/intl/hyphenation/glue/nsHyphenationManager.cpp b/intl/hyphenation/glue/nsHyphenationManager.cpp index f23c08344ce8..f475d2b027a7 100644 --- 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; diff --git a/intl/strres/nsStringBundle.cpp b/intl/strres/nsStringBundle.cpp index 8bc1b055fc56..320d122c72fe 100644 --- 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" diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h index fae79a379f54..7bdd82140b67 100644 --- 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" diff --git a/js/xpconnect/tests/components/native/xpctest_private.h b/js/xpconnect/tests/components/native/xpctest_private.h index 905cd26f485d..c5d7bc86cf67 100644 --- 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" diff --git a/layout/generic/nsFloatManager.cpp b/layout/generic/nsFloatManager.cpp index cf0359174256..d9b241a903c0 100644 --- 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; diff --git a/modules/libjar/zipwriter/nsDeflateConverter.cpp b/modules/libjar/zipwriter/nsDeflateConverter.cpp index 4da757a4c53d..1fead9aa7b21 100644 --- 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" diff --git a/modules/libjar/zipwriter/nsZipDataStream.cpp b/modules/libjar/zipwriter/nsZipDataStream.cpp index e71e12eefeea..97bfda5a6395 100644 --- 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 diff --git a/modules/libjar/zipwriter/nsZipHeader.cpp b/modules/libjar/zipwriter/nsZipHeader.cpp index 8b78ea091d50..7506670f1a43 100644 --- 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 diff --git a/modules/libjar/zipwriter/nsZipWriter.cpp b/modules/libjar/zipwriter/nsZipWriter.cpp index d781e3b80b0e..0a965871f26c 100644 --- 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" diff --git a/netwerk/streamconv/converters/nsHTTPCompressConv.cpp b/netwerk/streamconv/converters/nsHTTPCompressConv.cpp index d2e7783d70f6..46677eb63790 100644 --- 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" diff --git a/netwerk/wifi/nsWifiAccessPoint.cpp b/netwerk/wifi/nsWifiAccessPoint.cpp index 62687c520ef4..db2342772c43 100644 --- 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; diff --git a/parser/html/nsHtml5NamedCharacters.h b/parser/html/nsHtml5NamedCharacters.h index 243fc76ad7a4..379c2c17b9ef 100644 --- 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; diff --git a/parser/html/nsHtml5NamedCharactersAccel.h b/parser/html/nsHtml5NamedCharactersAccel.h index 8942790d5a41..de21f67c4532 100644 --- 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: diff --git a/storage/Variant.h b/storage/Variant.h index a2b580e284de..420ca94b94cf 100644 --- a/storage/Variant.h +++ b/storage/Variant.h @@ -10,7 +10,6 @@ #include #include "nsIVariant.h" -#include "nsMemory.h" #include "nsString.h" #include "nsTArray.h" diff --git a/storage/mozStorageArgValueArray.cpp b/storage/mozStorageArgValueArray.cpp index 5526786cf95a..56e97aaa8b14 100644 --- 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" diff --git a/storage/mozStorageAsyncStatement.cpp b/storage/mozStorageAsyncStatement.cpp index 9b8ff4987a5d..d0bd81e69b27 100644 --- a/storage/mozStorageAsyncStatement.cpp +++ b/storage/mozStorageAsyncStatement.cpp @@ -8,7 +8,6 @@ #include #include "nsError.h" -#include "nsMemory.h" #include "nsProxyRelease.h" #include "nsThreadUtils.h" #include "nsIClassInfoImpl.h" diff --git a/storage/mozStorageAsyncStatementJSHelper.cpp b/storage/mozStorageAsyncStatementJSHelper.cpp index 8b94f8df3dc2..73366f6604b4 100644 --- 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" diff --git a/storage/mozStorageAsyncStatementParams.cpp b/storage/mozStorageAsyncStatementParams.cpp index bd52173f412a..cb8601504e0b 100644 --- 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" diff --git a/storage/mozStorageStatement.cpp b/storage/mozStorageStatement.cpp index 21a43cf5da33..e889ad2ff104 100644 --- a/storage/mozStorageStatement.cpp +++ b/storage/mozStorageStatement.cpp @@ -8,7 +8,6 @@ #include #include "nsError.h" -#include "nsMemory.h" #include "nsThreadUtils.h" #include "nsIClassInfoImpl.h" #include "Variant.h" diff --git a/storage/mozStorageStatementJSHelper.cpp b/storage/mozStorageStatementJSHelper.cpp index 762bf4b8405b..c891e955a258 100644 --- 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" diff --git a/storage/mozStorageStatementParams.cpp b/storage/mozStorageStatementParams.cpp index 23e651d4416a..2d29e53a8781 100644 --- 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" diff --git a/storage/mozStorageStatementRow.cpp b/storage/mozStorageStatementRow.cpp index 33c85430fecb..7d203d7513aa 100644 --- 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" diff --git a/storage/test/gtest/storage_test_harness.h b/storage/test/gtest/storage_test_harness.h index e30c4cb85df8..51a6fea91da7 100644 --- 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" diff --git a/toolkit/components/places/tests/gtest/places_test_harness.h b/toolkit/components/places/tests/gtest/places_test_harness.h index 4ebe3982bd73..f2d3e06c35b9 100644 --- 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" diff --git a/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp b/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp index 2cb75e5a9be5..289d03874b36 100644 --- 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" diff --git a/toolkit/xre/MacLaunchHelper.mm b/toolkit/xre/MacLaunchHelper.mm index ec570ffab124..c6c0d97c18e3 100644 --- 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 #include diff --git a/tools/profiler/gecko/nsProfiler.cpp b/tools/profiler/gecko/nsProfiler.cpp index e9ad1ca675fa..12b6610c6d67 100644 --- 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" diff --git a/uriloader/exthandler/mac/nsOSHelperAppService.mm b/uriloader/exthandler/mac/nsOSHelperAppService.mm index 7eb742fd3cb9..f3f13fdf3141 100644 --- 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" diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index c438d4ee71d1..c0edce0101c7 100644 --- 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" diff --git a/uriloader/exthandler/nsOSHelperAppServiceChild.cpp b/uriloader/exthandler/nsOSHelperAppServiceChild.cpp index 426541c7855e..8ba3a2edc982 100644 --- 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" diff --git a/widget/cocoa/nsClipboard.mm b/widget/cocoa/nsClipboard.mm index a3b2ba1e32d4..5b89ae8e9757 100644 --- 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" diff --git a/widget/gtk/NativeKeyBindings.cpp b/widget/gtk/NativeKeyBindings.cpp index 5b78effe0c2b..d4e21c909221 100644 --- 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 diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp index c73130496ae7..5c8a9451fc89 100644 --- 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" diff --git a/widget/nsTransferable.cpp b/widget/nsTransferable.cpp index 2f42268ecfd2..8f1b6f3977c1 100644 --- 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" diff --git a/widget/windows/KeyboardLayout.cpp b/widget/windows/KeyboardLayout.cpp index 8a19e9e9c846..aaa9b6747b71 100644 --- 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" diff --git a/xpcom/base/LogModulePrefWatcher.cpp b/xpcom/base/LogModulePrefWatcher.cpp index acc9c748553b..bd06660533d4 100644 --- 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" diff --git a/xpcom/build/XPCOM.h b/xpcom/build/XPCOM.h index b3be1b7e4e93..78e68dc809e7 100644 --- 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" diff --git a/xpcom/ds/nsSupportsPrimitives.cpp b/xpcom/ds/nsSupportsPrimitives.cpp index acbe59b6d0a7..1d0db73187ce 100644 --- 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" diff --git a/xpcom/ds/nsVariant.cpp b/xpcom/ds/nsVariant.cpp index 72ee6cd502d2..3ccfc7fa3165 100644 --- 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" diff --git a/xpcom/io/nsLinebreakConverter.cpp b/xpcom/io/nsLinebreakConverter.cpp index 94ed2da6314b..019fc0e4ae2a 100644 --- a/xpcom/io/nsLinebreakConverter.cpp +++ b/xpcom/io/nsLinebreakConverter.cpp @@ -6,7 +6,6 @@ #include "nsLinebreakConverter.h" -#include "nsMemory.h" #include "nsCRT.h" /*---------------------------------------------------------------------------- diff --git a/xpcom/io/nsLocalFileWin.cpp b/xpcom/io/nsLocalFileWin.cpp index 68c5848952bf..4022af8dc1d0 100644 --- 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" diff --git a/xpcom/io/nsPipe3.cpp b/xpcom/io/nsPipe3.cpp index fab25ae38736..2f1ea520029f 100644 --- 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" diff --git a/xpcom/io/nsScriptableInputStream.cpp b/xpcom/io/nsScriptableInputStream.cpp index 7bbdb006b841..5f8b139c6fe9 100644 --- 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) diff --git a/xpcom/io/nsSegmentedBuffer.cpp b/xpcom/io/nsSegmentedBuffer.cpp index 7104bbf36e47..81dd43a8c30c 100644 --- 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" diff --git a/xpcom/io/nsStorageStream.h b/xpcom/io/nsStorageStream.h index e5f5092a7497..67caea2e59f8 100644 --- 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" diff --git a/xpcom/io/nsStringStream.h b/xpcom/io/nsStringStream.h index 55ecea5ab311..8568cc33f8c9 100644 --- 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" /** diff --git a/xpcom/string/nsReadableUtils.cpp b/xpcom/string/nsReadableUtils.cpp index 9e14398fbbee..fa4c4bc69b75 100644 --- 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" diff --git a/xpcom/string/nsTextFormatter.cpp b/xpcom/string/nsTextFormatter.cpp index c739cd152b60..076b9c12fcbb 100644 --- a/xpcom/string/nsTextFormatter.cpp +++ b/xpcom/string/nsTextFormatter.cpp @@ -15,12 +15,6 @@ * Daniele Nicolodi */ -/* - * Copied from xpcom/ds/nsTextFormatter.cpp r1.22 - * Changed to use nsMemory and Frozen linkage - * -- Prasad - */ - #include #include #include @@ -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); diff --git a/xpcom/tests/gtest/TestDeadlockDetector.cpp b/xpcom/tests/gtest/TestDeadlockDetector.cpp index 15e977a8f27e..c6e74ce0c1d9 100644 --- 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" diff --git a/xpcom/tests/gtest/TestExpirationTracker.cpp b/xpcom/tests/gtest/TestExpirationTracker.cpp index b6ab171ef857..de55d6f90731 100644 --- a/xpcom/tests/gtest/TestExpirationTracker.cpp +++ b/xpcom/tests/gtest/TestExpirationTracker.cpp @@ -8,7 +8,6 @@ #include #include #include "nsExpirationTracker.h" -#include "nsMemory.h" #include "nsString.h" #include "nsDirectoryServiceDefs.h" #include "nsDirectoryServiceUtils.h" diff --git a/xpcom/threads/nsProcessCommon.cpp b/xpcom/threads/nsProcessCommon.cpp index 7266e367be47..c1e303220608 100644 --- 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" diff --git a/xpcom/threads/nsThreadPool.cpp b/xpcom/threads/nsThreadPool.cpp index 68fde2319c4f..32c0fdbb2106 100644 --- 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"