Bug 1241518 - Part 1: Remove unused nsAutoPtr.h includes in xpcom/ r=kmag

EricRahm · EricRahm · commit 6d7549285977 · 2020-01-07T00:06:01.000Z
This removes various unused `#include "nsAutoPtr.h"` in `xpcom/`. Additionally adds a few includes to the media stack. Differential Revision: https://phabricator.services.mozilla.com/D58282 --HG-- extra : moz-landing-system : lando
diff --git a/dom/base/IdentifierMapEntry.h b/dom/base/IdentifierMapEntry.h
@@ -17,6 +17,7 @@
 #include "mozilla/Move.h"
 #include "mozilla/dom/TreeOrderedArray.h"
 
+#include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsAtom.h"
 #include "nsHashKeys.h"
diff --git a/dom/media/flac/FlacDemuxer.h b/dom/media/flac/FlacDemuxer.h
@@ -10,6 +10,7 @@
 #include "mozilla/Attributes.h"
 #include "MediaDataDemuxer.h"
 #include "MediaResource.h"
+#include "nsAutoPtr.h"
 namespace mozilla {
 
 namespace flac {
diff --git a/dom/media/mp4/Index.h b/dom/media/mp4/Index.h
@@ -11,12 +11,10 @@
 #include "MoofParser.h"
 #include "mozilla/Result.h"
 #include "MP4Interval.h"
+#include "nsAutoPtr.h"
 #include "nsISupportsImpl.h"
 #include "TimeUnits.h"
 
-template <class T>
-class nsAutoPtr;
-
 namespace mozilla {
 class IndiceWrapper;
 struct Sample;
diff --git a/media/mtransport/nr_timer.cpp b/media/mtransport/nr_timer.cpp
@@ -51,6 +51,7 @@
 
 #include <string>
 
+#include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsComponentManagerUtils.h"
 #include "nsServiceManagerUtils.h"
diff --git a/xpcom/base/OwningNonNull.h b/xpcom/base/OwningNonNull.h
@@ -9,7 +9,7 @@
 #ifndef mozilla_OwningNonNull_h
 #define mozilla_OwningNonNull_h
 
-#include "nsAutoPtr.h"
+#include "nsCOMPtr.h"
 #include "nsCycleCollectionNoteChild.h"
 
 namespace mozilla {
diff --git a/xpcom/base/nsErrorService.cpp b/xpcom/base/nsErrorService.cpp
@@ -6,7 +6,6 @@
 
 #include "nsErrorService.h"
 #include "nsCRTGlue.h"
-#include "nsAutoPtr.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/ClearOnShutdown.h"
 
diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp
@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsAtomTable.h"
-#include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsCOMArray.h"
 #include "nsPrintfCString.h"
diff --git a/xpcom/base/nsMessageLoop.cpp b/xpcom/base/nsMessageLoop.cpp
@@ -12,7 +12,6 @@
 #include "nsIRunnable.h"
 #include "nsITimer.h"
 #include "nsCOMPtr.h"
-#include "nsAutoPtr.h"
 #include "nsComponentManagerUtils.h"
 #include "nsThreadUtils.h"
 
diff --git a/xpcom/build/FileLocation.h b/xpcom/build/FileLocation.h
@@ -9,7 +9,6 @@
 
 #include "nsString.h"
 #include "nsCOMPtr.h"
-#include "nsAutoPtr.h"
 #include "nsIFile.h"
 #include "FileUtils.h"
 
diff --git a/xpcom/build/perfprobe.cpp b/xpcom/build/perfprobe.cpp
@@ -12,7 +12,6 @@
 #include <evntrace.h>
 
 #include "perfprobe.h"
-#include "nsAutoPtr.h"
 
 namespace mozilla {
 namespace probes {
diff --git a/xpcom/build/perfprobe.h b/xpcom/build/perfprobe.h
@@ -20,7 +20,6 @@
 #include "nsString.h"
 #include "mozilla/Logging.h"
 #include "nsTArray.h"
-#include "nsAutoPtr.h"
 #include <windows.h>
 #undef GetStartupInfo  // Prevent Windows from polluting global namespace
 #include <wmistr.h>
diff --git a/xpcom/components/nsCategoryCache.h b/xpcom/components/nsCategoryCache.h
@@ -13,7 +13,6 @@
 
 #include "nsServiceManagerUtils.h"
 
-#include "nsAutoPtr.h"
 #include "nsCOMArray.h"
 #include "nsInterfaceHashtable.h"
 
diff --git a/xpcom/ds/nsAtomTable.cpp b/xpcom/ds/nsAtomTable.cpp
@@ -17,7 +17,6 @@
 
 #include "nsAtom.h"
 #include "nsAtomTable.h"
-#include "nsAutoPtr.h"
 #include "nsCRT.h"
 #include "nsDataHashtable.h"
 #include "nsGkAtoms.h"
diff --git a/xpcom/ds/nsExpirationTracker.h b/xpcom/ds/nsExpirationTracker.h
@@ -11,7 +11,6 @@
 #include "nsTArray.h"
 #include "nsITimer.h"
 #include "nsCOMPtr.h"
-#include "nsAutoPtr.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIEventTarget.h"
 #include "nsIObserver.h"
diff --git a/xpcom/ds/nsHashKeys.h b/xpcom/ds/nsHashKeys.h
@@ -9,7 +9,6 @@
 
 #include "nsID.h"
 #include "nsISupports.h"
-#include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "PLDHashTable.h"
 #include <new>
diff --git a/xpcom/ds/nsObserverList.cpp b/xpcom/ds/nsObserverList.cpp
@@ -7,7 +7,6 @@
 #include "nsObserverList.h"
 
 #include "mozilla/ResultExtensions.h"
-#include "nsAutoPtr.h"
 #include "nsCOMArray.h"
 #include "xpcpublic.h"
 
diff --git a/xpcom/ds/nsObserverService.cpp b/xpcom/ds/nsObserverService.cpp
@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/Logging.h"
-#include "nsAutoPtr.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIConsoleService.h"
 #include "nsIObserverService.h"
diff --git a/xpcom/ds/nsPersistentProperties.cpp b/xpcom/ds/nsPersistentProperties.cpp
@@ -9,7 +9,6 @@
 #include "nsCOMArray.h"
 #include "nsUnicharInputStream.h"
 #include "nsPrintfCString.h"
-#include "nsAutoPtr.h"
 
 #include "nsPersistentProperties.h"
 #include "nsIProperties.h"
diff --git a/xpcom/ds/nsRefPtrHashtable.h b/xpcom/ds/nsRefPtrHashtable.h
@@ -9,7 +9,6 @@
 
 #include "nsBaseHashtable.h"
 #include "nsHashKeys.h"
-#include "nsAutoPtr.h"
 
 /**
  * templated hashtable class maps keys to reference pointers.
diff --git a/xpcom/ds/nsWindowsRegKey.cpp b/xpcom/ds/nsWindowsRegKey.cpp
@@ -11,7 +11,6 @@
 #include "nsString.h"
 #include "nsCOMPtr.h"
 #include "mozilla/Attributes.h"
-#include "nsAutoPtr.h"
 
 //-----------------------------------------------------------------------------
 
diff --git a/xpcom/io/SpecialSystemDirectory.cpp b/xpcom/io/SpecialSystemDirectory.cpp
@@ -7,7 +7,6 @@
 #include "SpecialSystemDirectory.h"
 #include "nsString.h"
 #include "nsDependentString.h"
-#include "nsAutoPtr.h"
 
 #if defined(XP_WIN)
 
diff --git a/xpcom/io/nsAnonymousTemporaryFile.cpp b/xpcom/io/nsAnonymousTemporaryFile.cpp
@@ -19,7 +19,6 @@
 #  include "nsIIdleService.h"
 #  include "nsISimpleEnumerator.h"
 #  include "nsIFile.h"
-#  include "nsAutoPtr.h"
 #  include "nsITimer.h"
 #  include "nsCRT.h"
 
diff --git a/xpcom/io/nsDirectoryService.cpp b/xpcom/io/nsDirectoryService.cpp
@@ -7,7 +7,6 @@
 #include "mozilla/ArrayUtils.h"
 
 #include "nsCOMPtr.h"
-#include "nsAutoPtr.h"
 #include "nsDirectoryService.h"
 #include "nsLocalFile.h"
 #include "nsDebug.h"
diff --git a/xpcom/io/nsLocalFileWin.cpp b/xpcom/io/nsLocalFileWin.cpp
@@ -10,7 +10,6 @@
 #include "mozilla/Utf8.h"
 
 #include "nsCOMPtr.h"
-#include "nsAutoPtr.h"
 #include "nsMemory.h"
 #include "GeckoProfiler.h"
 
diff --git a/xpcom/io/nsStreamUtils.cpp b/xpcom/io/nsStreamUtils.cpp
@@ -7,7 +7,6 @@
 #include "mozilla/Mutex.h"
 #include "mozilla/Attributes.h"
 #include "nsStreamUtils.h"
-#include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsICloneableInputStream.h"
 #include "nsIEventTarget.h"
diff --git a/xpcom/io/nsUnicharInputStream.cpp b/xpcom/io/nsUnicharInputStream.cpp
@@ -8,7 +8,6 @@
 #include "nsIInputStream.h"
 #include "nsString.h"
 #include "nsTArray.h"
-#include "nsAutoPtr.h"
 #include "nsCRT.h"
 #include "nsStreamUtils.h"
 #include "nsConverterInputStream.h"
diff --git a/xpcom/reflect/xptcall/xptcprivate.h b/xpcom/reflect/xptcall/xptcprivate.h
@@ -9,7 +9,6 @@
 #define xptcprivate_h___
 
 #include "xptcall.h"
-#include "nsAutoPtr.h"
 #include "mozilla/Attributes.h"
 
 #if !defined(__ia64) || \
diff --git a/xpcom/tests/TestHarness.h b/xpcom/tests/TestHarness.h
@@ -19,7 +19,6 @@
 #include "nsComponentManagerUtils.h"
 #include "nsServiceManagerUtils.h"
 #include "nsCOMPtr.h"
-#include "nsAutoPtr.h"
 #include "nsString.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsDirectoryServiceDefs.h"
diff --git a/xpcom/tests/gtest/TestCallTemplates.cpp b/xpcom/tests/gtest/TestCallTemplates.cpp
@@ -17,7 +17,6 @@
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsComponentManagerUtils.h"
 #include "nsServiceManagerUtils.h"
-#include "nsAutoPtr.h"
 #include "mozilla/Attributes.h"
 
 #define NS_ITESTSERVICE_IID                          \
diff --git a/xpcom/tests/gtest/TestExpirationTracker.cpp b/xpcom/tests/gtest/TestExpirationTracker.cpp
@@ -9,7 +9,6 @@
 #include <prthread.h>
 #include "nsExpirationTracker.h"
 #include "nsMemory.h"
-#include "nsAutoPtr.h"
 #include "nsString.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
diff --git a/xpcom/tests/gtest/TestRacingServiceManager.cpp b/xpcom/tests/gtest/TestRacingServiceManager.cpp
@@ -8,7 +8,6 @@
 #include "nsXULAppAPI.h"
 #include "nsIThread.h"
 
-#include "nsAutoPtr.h"
 #include "nsThreadUtils.h"
 #include "nsXPCOMCIDInternal.h"
 #include "pratom.h"
diff --git a/xpcom/tests/gtest/TestTArray2.cpp b/xpcom/tests/gtest/TestTArray2.cpp
@@ -11,7 +11,6 @@
 #include <stdio.h>
 #include <iostream>
 #include "nsTArray.h"
-#include "nsAutoPtr.h"
 #include "nsString.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
diff --git a/xpcom/threads/nsProcessCommon.cpp b/xpcom/threads/nsProcessCommon.cpp
@@ -15,7 +15,6 @@
 #include "mozilla/ArrayUtils.h"
 
 #include "nsCOMPtr.h"
-#include "nsAutoPtr.h"
 #include "nsMemory.h"
 #include "nsProcess.h"
 #include "prio.h"
diff --git a/xpcom/threads/nsProxyRelease.h b/xpcom/threads/nsProxyRelease.h
@@ -13,7 +13,6 @@
 #include "mozilla/SystemGroup.h"
 #include "mozilla/TypeTraits.h"
 #include "mozilla/Unused.h"
-#include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsIEventTarget.h"
 #include "nsIThread.h"
diff --git a/xpcom/threads/nsThreadManager.cpp b/xpcom/threads/nsThreadManager.cpp
@@ -10,7 +10,6 @@
 #include "nsThreadUtils.h"
 #include "nsIClassInfoImpl.h"
 #include "nsTArray.h"
-#include "nsAutoPtr.h"
 #include "nsXULAppAPI.h"
 #include "MainThreadQueue.h"
 #include "mozilla/AbstractThread.h"
@@ -47,8 +46,8 @@ class BackgroundEventTarget final : public nsIEventTarget {
 
   nsresult Init();
 
-  already_AddRefed<nsISerialEventTarget>
-    CreateBackgroundTaskQueue(const char* aName);
+  already_AddRefed<nsISerialEventTarget> CreateBackgroundTaskQueue(
+      const char* aName);
 
   void BeginShutdown(nsTArray<RefPtr<ShutdownPromise>>&);
   void FinishShutdown();
@@ -66,8 +65,7 @@ class BackgroundEventTarget final : public nsIEventTarget {
 NS_IMPL_ISUPPORTS(BackgroundEventTarget, nsIEventTarget)
 
 BackgroundEventTarget::BackgroundEventTarget()
-    : mMutex("BackgroundEventTarget::mMutex")
-{}
+    : mMutex("BackgroundEventTarget::mMutex") {}
 
 nsresult BackgroundEventTarget::Init() {
   nsCOMPtr<nsIThreadPool> pool(new nsThreadPool());
@@ -170,7 +168,8 @@ BackgroundEventTarget::DelayedDispatch(already_AddRefed<nsIRunnable> aRunnable,
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-void BackgroundEventTarget::BeginShutdown(nsTArray<RefPtr<ShutdownPromise>>& promises) {
+void BackgroundEventTarget::BeginShutdown(
+    nsTArray<RefPtr<ShutdownPromise>>& promises) {
   for (auto& queue : mTaskQueues) {
     promises.AppendElement(queue->BeginShutdown());
   }
@@ -181,12 +180,13 @@ void BackgroundEventTarget::FinishShutdown() {
   mIOPool->Shutdown();
 }
 
-already_AddRefed<nsISerialEventTarget> BackgroundEventTarget::CreateBackgroundTaskQueue(const char* aName) {
+already_AddRefed<nsISerialEventTarget>
+BackgroundEventTarget::CreateBackgroundTaskQueue(const char* aName) {
   MutexAutoLock lock(mMutex);
 
   RefPtr<TaskQueue> queue = new TaskQueue(do_AddRef(this), aName,
-                                          /*aSupportsTailDispatch=*/ false,
-                                          /*aRetainFlags=*/ true);
+                                          /*aSupportsTailDispatch=*/false,
+                                          /*aRetainFlags=*/true);
   nsCOMPtr<nsISerialEventTarget> target(queue->WrapAsEventTarget());
 
   mTaskQueues.AppendElement(queue.forget());
@@ -426,20 +426,22 @@ void nsThreadManager::Shutdown() {
 
   bool taskQueuesShutdown = false;
 
-  complete->Then(mMainThread, __func__,
-                 [&](const ResolveValueT& aResolveValue) {
-                   mBackgroundEventTarget->FinishShutdown();
-                   taskQueuesShutdown = true;
-                 },
-                 [&](RejectValueT aRejectValue) {
-                   mBackgroundEventTarget->FinishShutdown();
-                   taskQueuesShutdown = true;
-                 });
-
-  // Wait for task queues to shutdown, so we don't shut down the underlying threads
-  // of the background event target in the block below, thereby preventing the task
-  // queues from emptying, preventing the shutdown promises from resolving, and
-  // prevent anything checking `taskQueuesShutdown` from working.
+  complete->Then(
+      mMainThread, __func__,
+      [&](const ResolveValueT& aResolveValue) {
+        mBackgroundEventTarget->FinishShutdown();
+        taskQueuesShutdown = true;
+      },
+      [&](RejectValueT aRejectValue) {
+        mBackgroundEventTarget->FinishShutdown();
+        taskQueuesShutdown = true;
+      });
+
+  // Wait for task queues to shutdown, so we don't shut down the underlying
+  // threads of the background event target in the block below, thereby
+  // preventing the task queues from emptying, preventing the shutdown promises
+  // from resolving, and prevent anything checking `taskQueuesShutdown` from
+  // working.
   ::SpinEventLoopUntil([&]() { return taskQueuesShutdown; }, mMainThread);
 
   {
@@ -552,7 +554,8 @@ nsresult nsThreadManager::DispatchToBackgroundThread(nsIRunnable* aEvent,
   return backgroundTarget->Dispatch(aEvent, aDispatchFlags);
 }
 
-already_AddRefed<nsISerialEventTarget> nsThreadManager::CreateBackgroundTaskQueue(const char* aName) {
+already_AddRefed<nsISerialEventTarget>
+nsThreadManager::CreateBackgroundTaskQueue(const char* aName) {
   if (!mInitialized) {
     return nullptr;
   }
diff --git a/xpcom/threads/nsThreadPool.cpp b/xpcom/threads/nsThreadPool.cpp
@@ -10,7 +10,6 @@
 #include "nsThreadManager.h"
 #include "nsThread.h"
 #include "nsMemory.h"
-#include "nsAutoPtr.h"
 #include "prinrval.h"
 #include "mozilla/Logging.h"
 #include "mozilla/SystemGroup.h"
diff --git a/xpcom/threads/nsThreadUtils.h b/xpcom/threads/nsThreadUtils.h
@@ -20,7 +20,6 @@
 #include "nsIThread.h"
 #include "nsString.h"
 #include "nsCOMPtr.h"
-#include "nsAutoPtr.h"
 #include "xpcpublic.h"
 #include "mozilla/AbstractEventQueue.h"
 #include "mozilla/Atomics.h"
diff --git a/xpcom/threads/nsTimerImpl.cpp b/xpcom/threads/nsTimerImpl.cpp
