Bug 1572565 - Make the remote sandbox broker process' telemetry strin…

…g consistent r=jld Differential Revision: https://phabricator.services.mozilla.com/D41291
iaxat · Aug 9, 2019 · 7325443 · 7325443
1 parent 997fb92
commit 7325443
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/security/sandbox/win/src/remotesandboxbroker/RemoteSandboxBrokerParent.cpp b/security/sandbox/win/src/remotesandboxbroker/RemoteSandboxBrokerParent.cpp
@@ -60,7 +60,9 @@ bool RemoteSandboxBrokerParent::DuplicateFromLauncher(HANDLE aLauncherHandle,
 void RemoteSandboxBrokerParent::ActorDestroy(ActorDestroyReason aWhy) {
   if (AbnormalShutdown == aWhy) {
     Telemetry::Accumulate(Telemetry::SUBPROCESS_ABNORMAL_ABORT,
-                          NS_LITERAL_CSTRING("sandboxbroker"), 1);
+                          nsDependentCString(XRE_ChildProcessTypeToString(
+                              GeckoProcessType_RemoteSandboxBroker)),
+                          1);
     if (mCrashReporter) {
       mCrashReporter->GenerateCrashReport(OtherPid());
       mCrashReporter = nullptr;

diff --git a/xpcom/build/GeckoProcessTypes.h b/xpcom/build/GeckoProcessTypes.h
@@ -36,5 +36,5 @@ GECKO_PROCESS_TYPE(VR, "vr", VR, Self)
 GECKO_PROCESS_TYPE(RDD, "rdd", RDD, Self)
 // Socket process
 GECKO_PROCESS_TYPE(Socket, "socket", Socket, Self)
-GECKO_PROCESS_TYPE(RemoteSandboxBroker, "sandbox", RemoteSandboxBroker,
+GECKO_PROCESS_TYPE(RemoteSandboxBroker, "sandboxbroker", RemoteSandboxBroker,
                    PluginContainer)