Bug 1744425 - xre: Use nsID::GeneratorUUIDInPlace() instead of the nsUUIDGenerator service. r=mossop

This change is needed to avoid toolkit/components/backgroundtasks/tests/browser/browser_xpcom_graph_wait.js test failures where the nsUUIDGenerator service was loaded during ASan test runs but not non-ASan test runs (due to differences in temp profile directory paths). With this change, the nsUUIDGenerator service is no longer needed in BackgroundTasks.

Using nsID::GenerateUUIDInPlace() also avoids the overhead of instantiating the nsUUIDGenerator service.

Depends on D136992

Differential Revision: https://phabricator.services.mozilla.com/D136993

Author: cpeterso

toolkit/components/backgroundtasks/tests/browser/browser_xpcom_graph_wait.js

@@ -83,7 +83,6 @@ const backgroundtaskPhases = {
         "@mozilla.org/storage/service;1",
         "@mozilla.org/thirdpartyutil;1",
         "@mozilla.org/toolkit/app-startup;1",
-        "@mozilla.org/uuid-generator;1",
         {
           name: "@mozilla.org/widget/appshell/mac;1",
           condition: MAC,

toolkit/xre/nsAppRunner.cpp

@@ -83,7 +83,6 @@
 #include "nsIStringBundle.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIToolkitProfile.h"
-#include "nsIUUIDGenerator.h"
 #include "nsToolkitProfileService.h"
 #include "nsIURI.h"
 #include "nsIURL.h"
@@ -134,9 +133,6 @@
 
 #if defined(MOZ_SANDBOX)
 #  include "mozilla/SandboxSettings.h"
-#  if (defined(XP_WIN) || defined(XP_MACOSX))
-#    include "nsIUUIDGenerator.h"
-#  endif
 #endif
 
 #ifdef ACCESSIBILITY
@@ -3146,10 +3142,7 @@ static void SubmitDowngradeTelemetry(const nsCString& aLastVersion,
   NS_ENSURE_SUCCESS_VOID(rv);
 
   nsID uuid;
-  nsCOMPtr<nsIUUIDGenerator> uuidGen =
-      do_GetService("@mozilla.org/uuid-generator;1");
-  NS_ENSURE_TRUE_VOID(uuidGen);
-  rv = uuidGen->GenerateUUIDInPlace(&uuid);
+  rv = nsID::GenerateUUIDInPlace(uuid);
   NS_ENSURE_SUCCESS_VOID(rv);
 
   nsCString arch("null");

toolkit/xre/nsXREDirProvider.cpp

@@ -78,7 +78,7 @@
 
 #if defined(MOZ_SANDBOX)
 #  include "mozilla/SandboxSettings.h"
-#  include "nsIUUIDGenerator.h"
+#  include "nsID.h"
 #  include "mozilla/Unused.h"
 #  if defined(XP_WIN)
 #    include "sandboxBroker.h"
@@ -721,15 +721,10 @@ static already_AddRefed<nsIFile> CreateProcessSandboxTempDir(
   nsresult rv;
   nsAutoString tempDirSuffix;
   mozilla::Preferences::GetString(pref, tempDirSuffix);
-  if (tempDirSuffix.IsEmpty()) {
-    nsCOMPtr<nsIUUIDGenerator> uuidgen =
-        do_GetService("@mozilla.org/uuid-generator;1", &rv);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return nullptr;
-    }
 
+  if (tempDirSuffix.IsEmpty()) {
     nsID uuid;
-    rv = uuidgen->GenerateUUIDInPlace(&uuid);
+    rv = nsID::GenerateUUIDInPlace(uuid);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return nullptr;
     }