From cd8523e75bf9476d1f65987a8a326a1c3fd909f8 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <billm@mozilla.com>
Date: Tue, 30 Jun 2015 17:12:30 -0700
Subject: [PATCH] Bug 1177013 - Telemetry for CPOW cancelation (r=dvander)

---
 ipc/glue/MessageChannel.cpp                  | 2 ++
 toolkit/components/telemetry/Histograms.json | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/ipc/glue/MessageChannel.cpp b/ipc/glue/MessageChannel.cpp
index 2e725884d8d..6cc12cbded1 100644
--- a/ipc/glue/MessageChannel.cpp
+++ b/ipc/glue/MessageChannel.cpp
@@ -14,6 +14,7 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Move.h"
 #include "mozilla/SizePrintfMacros.h"
+#include "mozilla/Telemetry.h"
 #include "nsDebug.h"
 #include "nsISupportsImpl.h"
 #include "nsContentUtils.h"
@@ -2040,6 +2041,7 @@ void
 CancelCPOWs()
 {
     if (gParentProcessBlocker) {
+        mozilla::Telemetry::Accumulate(mozilla::Telemetry::IPC_TRANSACTION_CANCEL, true);
         gParentProcessBlocker->CancelCurrentTransaction();
     }
 }
diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index 4e85d14d559..4109e0e68da 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -4843,6 +4843,12 @@
     "keyed" : true,
     "description" : "Exceptions thrown by add-ons"
   },
+  "IPC_TRANSACTION_CANCEL": {
+    "alert_emails": ["billm@mozilla.com"],
+    "expires_in_version": "never",
+    "kind": "boolean",
+    "description": "True when an IPC transaction is canceled"
+  },
   "MISBEHAVING_ADDONS_CPOW_TIME_MS": {
     "expires_in_version": "never",
     "kind": "exponential",