From c68e8e19caeaea2a88fb3d4486ef5dd4f0f87d9c Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Tue, 11 Mar 2014 09:24:39 +0000
Subject: [PATCH] Bug 976454 - MozActivity emits ActivityCancelled instead
 USER_ABORT, r=fabrice

---
 dom/activities/src/ActivitiesService.jsm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dom/activities/src/ActivitiesService.jsm b/dom/activities/src/ActivitiesService.jsm
index 62fbeee8779..6e2f4b0bdc0 100644
--- a/dom/activities/src/ActivitiesService.jsm
+++ b/dom/activities/src/ActivitiesService.jsm
@@ -221,7 +221,7 @@ let Activities = {
         if (aChoice === -1) {
           Activities.callers[aMsg.id].mm.sendAsyncMessage("Activity:FireError", {
             "id": aMsg.id,
-            "error": "USER_ABORT"
+            "error": "ActivityCanceled"
           });
           delete Activities.callers[aMsg.id];
           return;
@@ -357,7 +357,7 @@ let Activities = {
           if (this.callers[id].childMM == mm) {
             this.callers[id].mm.sendAsyncMessage("Activity:FireError", {
               "id": id,
-              "error": "USER_ABORT"
+              "error": "ActivityCanceled"
             });
             delete this.callers[id];
             break;