Bug 1753424 - Add SandboxingKind for UtilityProcess crash annotations r=gsvelto

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

ipc/glue/UtilityProcessManager.cpp

@@ -144,7 +144,7 @@ RefPtr<GenericNonExclusivePromise> UtilityProcessManager::LaunchProcess(
   RefPtr<UtilityProcessManager> self = this;
   mLaunchPromise = mProcess->LaunchPromise()->Then(
       GetMainThreadSerialEventTarget(), __func__,
-      [self](bool) {
+      [self, aSandbox](bool) {
         if (self->IsShutdown()) {
           return GenericNonExclusivePromise::CreateAndReject(
               NS_ERROR_NOT_AVAILABLE, __func__);
@@ -169,6 +169,10 @@ RefPtr<GenericNonExclusivePromise> UtilityProcessManager::LaunchProcess(
         CrashReporter::AnnotateCrashReport(
             CrashReporter::Annotation::UtilityProcessStatus, "Running"_ns);
 
+        CrashReporter::AnnotateCrashReport(
+            CrashReporter::Annotation::UtilityProcessSandboxingKind,
+            (unsigned int)aSandbox);
+
         return GenericNonExclusivePromise::CreateAndResolve(true, __func__);
       },
       [self](nsresult aError) {

ipc/glue/test/browser/browser_utility_crashReporter.js

@@ -47,6 +47,11 @@ add_task(async () => {
       "Record should be a utility process crash"
     );
     ok(crash.id === dumpID, "Record should have an ID");
+    ok(
+      parseInt(crash.metadata.UtilityProcessSandboxingKind, 10) ===
+        kGenericUtility,
+      "Record should have the sandboxing kind value"
+    );
   });
 
   let minidumpDirectory = Services.dirsvc.get("ProfD", Ci.nsIFile);

ipc/glue/test/browser/head.js

@@ -8,6 +8,8 @@ const utilityProcessTest = Cc[
   "@mozilla.org/utility-process-test;1"
 ].createInstance(Ci.nsIUtilityProcessTest);
 
+const kGenericUtility = 0x0;
+
 function startUtilityProcess() {
   add_task(async () => {
     info("Start a UtilityProcess");

toolkit/crashreporter/CrashAnnotations.yaml

@@ -971,6 +971,11 @@ UtilityProcessStatus:
     Status of the Utility process, can be set to "Running" or "Destroyed"
   type: string
 
+UtilityProcessSandboxingKind:
+  description: >
+    The SandboxingKind passed for this Utility process instance
+  type: integer
+
 Vendor:
   description: >
     Application vendor (e.g. Mozilla).