Bug 1617334 - Remove nsAutoPtr usage from toolkit. r=gsvelto

Differential Revision: https://phabricator.services.mozilla.com/D63746 --HG-- extra : moz-landing-system : lando
dothq · Feb 22, 2020 · b224a74 · b224a74
1 parent f6f3900
commit b224a74
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 37 deletions.
diff --git a/toolkit/components/autocomplete/nsAutoCompleteController.cpp b/toolkit/components/autocomplete/nsAutoCompleteController.cpp
@@ -6,7 +6,6 @@
 #include "nsAutoCompleteController.h"
 #include "nsAutoCompleteSimpleResult.h"
 
-#include "nsAutoPtr.h"
 #include "nsNetCID.h"
 #include "nsIIOService.h"
 #include "nsReadableUtils.h"

diff --git a/toolkit/components/browser/nsWebBrowser.h b/toolkit/components/browser/nsWebBrowser.h
@@ -11,7 +11,6 @@
 #include "nsDocShellTreeOwner.h"
 
 // Core Includes
-#include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 

diff --git a/toolkit/components/downloads/DownloadPlatform.cpp b/toolkit/components/downloads/DownloadPlatform.cpp
@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "DownloadPlatform.h"
-#include "nsAutoPtr.h"
 #include "nsNetUtil.h"
 #include "nsString.h"
 #include "nsINestedURI.h"

diff --git a/toolkit/components/filewatcher/NativeFileWatcherWin.cpp b/toolkit/components/filewatcher/NativeFileWatcherWin.cpp
@@ -11,7 +11,6 @@
 
 #include "mozilla/Services.h"
 #include "mozilla/UniquePtr.h"
-#include "nsAutoPtr.h"
 #include "nsClassHashtable.h"
 #include "nsComponentManagerUtils.h"
 #include "nsDataHashtable.h"
@@ -554,7 +553,7 @@ nsresult NativeFileWatcherIOTask::AddPathRunnableMethod(
     PathRunnablesParametersWrapper* aWrappedParameters) {
   MOZ_ASSERT(!NS_IsMainThread());
 
-  nsAutoPtr<PathRunnablesParametersWrapper> wrappedParameters(
+  UniquePtr<PathRunnablesParametersWrapper> wrappedParameters(
       aWrappedParameters);
 
   // We return immediately if |mShuttingDown| is true (see below for
@@ -725,7 +724,7 @@ nsresult NativeFileWatcherIOTask::RemovePathRunnableMethod(
     PathRunnablesParametersWrapper* aWrappedParameters) {
   MOZ_ASSERT(!NS_IsMainThread());
 
-  nsAutoPtr<PathRunnablesParametersWrapper> wrappedParameters(
+  UniquePtr<PathRunnablesParametersWrapper> wrappedParameters(
       aWrappedParameters);
 
   // We return immediately if |mShuttingDown| is true (see below for

diff --git a/toolkit/components/parentalcontrols/nsParentalControlsService.h b/toolkit/components/parentalcontrols/nsParentalControlsService.h
@@ -8,7 +8,6 @@
 
 #include "nsIParentalControlsService.h"
 #include "nsCOMPtr.h"
-#include "nsAutoPtr.h"
 #include "nsIURI.h"
 
 #if defined(XP_WIN)

diff --git a/toolkit/components/places/PlaceInfo.h b/toolkit/components/places/PlaceInfo.h
@@ -8,7 +8,6 @@
 #include "mozIAsyncHistory.h"
 #include "nsString.h"
 #include "nsTArray.h"
-#include "nsAutoPtr.h"
 #include "mozilla/Attributes.h"
 
 class nsIURI;

diff --git a/toolkit/components/places/VisitInfo.h b/toolkit/components/places/VisitInfo.h
@@ -6,7 +6,6 @@
 #define mozilla_places_VisitInfo_h__
 
 #include "mozIAsyncHistory.h"
-#include "nsAutoPtr.h"
 #include "mozilla/Attributes.h"
 
 class nsIURI;

diff --git a/toolkit/components/remote/nsRemoteService.cpp b/toolkit/components/remote/nsRemoteService.cpp
@@ -26,13 +26,13 @@
 #endif
 #include "nsRemoteService.h"
 
-#include "nsAutoPtr.h"
 #include "nsIObserverService.h"
 #include "nsString.h"
 #include "nsServiceManagerUtils.h"
 #include "mozilla/ModuleUtils.h"
 #include "SpecialSystemDirectory.h"
 #include "mozilla/CmdLineAndEnvUtils.h"
+#include "mozilla/UniquePtr.h"
 
 // Time to wait for the remoting service to start
 #define START_TIMEOUT_SEC 5
@@ -99,23 +99,23 @@ RemoteResult nsRemoteService::StartClient(const char* aDesktopStartupID) {
     return REMOTE_NOT_FOUND;
   }
 
-  nsAutoPtr<nsRemoteClient> client;
+  UniquePtr<nsRemoteClient> client;
 
 #ifdef MOZ_WIDGET_GTK
   bool useX11Remote = GDK_IS_X11_DISPLAY(gdk_display_get_default());
 
 #  if defined(MOZ_ENABLE_DBUS)
   if (!useX11Remote || getenv(DBUS_REMOTE_ENV)) {
-    client = new nsDBusRemoteClient();
+    client = MakeUnique<nsDBusRemoteClient>();
   }
 #  endif
   if (!client && useX11Remote) {
-    client = new nsXRemoteClient();
+    client = MakeUnique<nsXRemoteClient>();
   }
 #elif defined(XP_WIN)
-  client = new nsWinRemoteClient();
+  client = MakeUnique<nsWinRemoteClient>();
 #elif defined(XP_DARWIN)
-  client = new nsMacRemoteClient();
+  client = MakeUnique<nsMacRemoteClient>();
 #else
   return REMOTE_NOT_FOUND;
 #endif

diff --git a/toolkit/components/reputationservice/ApplicationReputation.cpp b/toolkit/components/reputationservice/ApplicationReputation.cpp
@@ -36,7 +36,6 @@
 #include "mozilla/TimeStamp.h"
 #include "mozilla/intl/LocaleService.h"
 
-#include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsDebug.h"
 #include "nsDependentSubstring.h"

diff --git a/toolkit/components/sessionstore/SessionStoreUtils.cpp b/toolkit/components/sessionstore/SessionStoreUtils.cpp
@@ -17,6 +17,7 @@
 #include "mozilla/dom/XPathResult.h"
 #include "mozilla/dom/XPathEvaluator.h"
 #include "mozilla/dom/XPathExpression.h"
+#include "mozilla/UniquePtr.h"
 #include "nsCharSeparatedTokenizer.h"
 #include "nsContentList.h"
 #include "nsContentUtils.h"
@@ -991,7 +992,7 @@ static Element* FindNodeByXPath(JSContext* aCx, Document& aDocument,
                                 const nsAString& aExpression) {
   FormDataParseContext parsingContext(aDocument.IsHTMLDocument());
   IgnoredErrorResult rv;
-  nsAutoPtr<XPathExpression> expression(
+  UniquePtr<XPathExpression> expression(
       aDocument.XPathEvaluator()->CreateExpression(aExpression, &parsingContext,
                                                    &aDocument, rv));
   if (rv.Failed()) {

diff --git a/toolkit/components/startup/nsAppStartup.cpp b/toolkit/components/startup/nsAppStartup.cpp
@@ -21,7 +21,6 @@
 #include "nsIAppWindow.h"
 #include "nsNativeCharsetUtils.h"
 #include "nsThreadUtils.h"
-#include "nsAutoPtr.h"
 #include "nsString.h"
 #include "mozilla/AppShutdown.h"
 #include "mozilla/Preferences.h"

diff --git a/toolkit/components/startup/nsAppStartup.h b/toolkit/components/startup/nsAppStartup.h
@@ -17,7 +17,6 @@
 #if defined(XP_WIN)
 // XPerf-backed probes
 #  include "mozilla/perfprobe.h"
-#  include "nsAutoPtr.h"
 #endif  // defined(XP_WIN)
 
 // {7DD4D320-C84B-4624-8D45-7BB9B2356977}

diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp
@@ -319,7 +319,7 @@ class ReportInjectedCrash : public Runnable {
 // If annotations are attempted before the crash reporter is enabled,
 // they queue up here.
 class DelayedNote;
-nsTArray<nsAutoPtr<DelayedNote> >* gDelayedAnnotations;
+nsTArray<UniquePtr<DelayedNote> >* gDelayedAnnotations;
 
 #if defined(XP_WIN)
 // the following are used to prevent other DLLs reverting the last chance
@@ -2376,14 +2376,14 @@ class DelayedNote {
 
 static void EnqueueDelayedNote(DelayedNote* aNote) {
   if (!gDelayedAnnotations) {
-    gDelayedAnnotations = new nsTArray<nsAutoPtr<DelayedNote> >();
+    gDelayedAnnotations = new nsTArray<UniquePtr<DelayedNote> >();
   }
-  gDelayedAnnotations->AppendElement(aNote);
+  gDelayedAnnotations->AppendElement(WrapUnique(aNote));
 }
 
 void NotifyCrashReporterClientCreated() {
   if (gDelayedAnnotations) {
-    for (nsAutoPtr<DelayedNote>& note : *gDelayedAnnotations) {
+    for (const auto& note : *gDelayedAnnotations) {
       note->Run();
     }
     delete gDelayedAnnotations;

diff --git a/toolkit/profile/nsProfileLock.cpp b/toolkit/profile/nsProfileLock.cpp
@@ -10,7 +10,6 @@
 
 #if defined(XP_WIN)
 #  include "ProfileUnlockerWin.h"
-#  include "nsAutoPtr.h"
 #endif
 
 #if defined(XP_MACOSX)

diff --git a/toolkit/system/gnome/nsGIOService.cpp b/toolkit/system/gnome/nsGIOService.cpp
@@ -8,7 +8,6 @@
 #include "nsIURI.h"
 #include "nsTArray.h"
 #include "nsStringEnumerator.h"
-#include "nsAutoPtr.h"
 #include "nsIMIMEInfo.h"
 #include "nsComponentManagerUtils.h"
 #include "nsArray.h"

diff --git a/toolkit/system/gnome/nsSystemAlertsService.cpp b/toolkit/system/gnome/nsSystemAlertsService.cpp
@@ -7,7 +7,6 @@
 #include "nsXULAppAPI.h"
 #include "nsSystemAlertsService.h"
 #include "nsAlertsIconListener.h"
-#include "nsAutoPtr.h"
 
 NS_IMPL_ADDREF(nsSystemAlertsService)
 NS_IMPL_RELEASE(nsSystemAlertsService)

diff --git a/toolkit/xre/CreateAppData.cpp b/toolkit/xre/CreateAppData.cpp
@@ -6,7 +6,6 @@
 #include "nsXULAppAPI.h"
 #include "nsINIParser.h"
 #include "nsIFile.h"
-#include "nsAutoPtr.h"
 #include "mozilla/XREAppData.h"
 
 // This include must appear early in the unified cpp file for toolkit/xre to

diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp
@@ -63,6 +63,7 @@
 #include "mozilla/AbstractThread.h"
 #include "mozilla/FilePreferences.h"
 #include "mozilla/RDDProcessImpl.h"
+#include "mozilla/UniquePtr.h"
 
 #include "mozilla/ipc/BrowserProcessSubThread.h"
 #include "mozilla/ipc/GeckoChildProcessHost.h"
@@ -684,51 +685,51 @@ nsresult XRE_InitChildProcess(int aArgc, char* aArgv[],
     // Associate this thread with a UI MessageLoop
     MessageLoop uiMessageLoop(uiLoopType);
     {
-      nsAutoPtr<ProcessChild> process;
+      UniquePtr<ProcessChild> process;
       switch (XRE_GetProcessType()) {
         case GeckoProcessType_Default:
           MOZ_CRASH("This makes no sense");
           break;
 
         case GeckoProcessType_Plugin:
-          process = new PluginProcessChild(parentPID);
+          process = MakeUnique<PluginProcessChild>(parentPID);
           break;
 
         case GeckoProcessType_Content:
-          process = new ContentProcess(parentPID);
+          process = MakeUnique<ContentProcess>(parentPID);
           break;
 
         case GeckoProcessType_IPDLUnitTest:
 #ifdef MOZ_IPDL_TESTS
-          process = new IPDLUnitTestProcessChild(parentPID);
+          process = MakeUnique<IPDLUnitTestProcessChild>(parentPID);
 #else
           MOZ_CRASH("rebuild with --enable-ipdl-tests");
 #endif
           break;
 
         case GeckoProcessType_GMPlugin:
-          process = new gmp::GMPProcessChild(parentPID);
+          process = MakeUnique<gmp::GMPProcessChild>(parentPID);
           break;
 
         case GeckoProcessType_GPU:
-          process = new gfx::GPUProcessImpl(parentPID);
+          process = MakeUnique<gfx::GPUProcessImpl>(parentPID);
           break;
 
         case GeckoProcessType_VR:
-          process = new gfx::VRProcessChild(parentPID);
+          process = MakeUnique<gfx::VRProcessChild>(parentPID);
           break;
 
         case GeckoProcessType_RDD:
-          process = new RDDProcessImpl(parentPID);
+          process = MakeUnique<RDDProcessImpl>(parentPID);
           break;
 
         case GeckoProcessType_Socket:
-          process = new net::SocketProcessImpl(parentPID);
+          process = MakeUnique<net::SocketProcessImpl>(parentPID);
           break;
 
 #if defined(MOZ_SANDBOX) && defined(XP_WIN)
         case GeckoProcessType_RemoteSandboxBroker:
-          process = new RemoteSandboxBrokerProcessChild(parentPID);
+          process = MakeUnique<RemoteSandboxBrokerProcessChild>(parentPID);
           break;
 #endif