From 59e57fa2ce8e0b65ace202c6d24c1f6bfb2922d8 Mon Sep 17 00:00:00 2001
From: Ben Kelly <ben@wanderview.com>
Date: Thu, 21 Jan 2016 08:50:00 -0500
Subject: [PATCH] Bug 1241531 - Part 4: Make service worker unregister job
 respect cancelation. r=ehsan

---
 dom/workers/ServiceWorkerManager.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dom/workers/ServiceWorkerManager.cpp b/dom/workers/ServiceWorkerManager.cpp
index d938bbcfd5b..55833d65da8 100644
--- a/dom/workers/ServiceWorkerManager.cpp
+++ b/dom/workers/ServiceWorkerManager.cpp
@@ -2461,6 +2461,10 @@ private:
   {
     AssertIsOnMainThread();
 
+    if (mCanceled) {
+      return mCallback ? mCallback->UnregisterSucceeded(false) : NS_OK;
+    }
+
     PrincipalInfo principalInfo;
     if (NS_WARN_IF(NS_FAILED(PrincipalToPrincipalInfo(mPrincipal,
                                                       &principalInfo)))) {