From 362e16ffd17776bce0f3e75ec326e63fc572e445 Mon Sep 17 00:00:00 2001
From: Nikhil Marathe <nsm.nikhil@gmail.com>
Date: Wed, 5 Aug 2015 13:21:08 -0700
Subject: [PATCH] Bug 1191495 - Relax PushManager callback assertions.
 r=kitcambridge

---
 dom/push/PushManager.cpp | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/dom/push/PushManager.cpp b/dom/push/PushManager.cpp
index df874446c6d..8527fd60402 100644
--- a/dom/push/PushManager.cpp
+++ b/dom/push/PushManager.cpp
@@ -286,7 +286,6 @@ public:
 
   explicit WorkerUnsubscribeResultCallback(PromiseWorkerProxy* aProxy)
     : mProxy(aProxy)
-    , mCallbackCalled(false)
   {
     AssertIsOnMainThread();
   }
@@ -295,7 +294,6 @@ public:
   OnUnsubscribe(nsresult aStatus, bool aSuccess) override
   {
     AssertIsOnMainThread();
-    mCallbackCalled = true;
     if (!mProxy) {
       return NS_OK;
     }
@@ -319,14 +317,9 @@ public:
 
 private:
   ~WorkerUnsubscribeResultCallback()
-  {
-    // Enforces that UnsubscribeRunnable uses the callback for error
-    // reporting once it creates the callback.
-    MOZ_ASSERT(mCallbackCalled);
-  }
+  {}
 
   nsRefPtr<PromiseWorkerProxy> mProxy;
-  DebugOnly<bool> mCallbackCalled;
 };
 
 NS_IMPL_ISUPPORTS(WorkerUnsubscribeResultCallback, nsIUnsubscribeResultCallback)
@@ -477,14 +470,12 @@ public:
                                    const nsAString& aScope)
     : mProxy(aProxy)
     , mScope(aScope)
-    , mCallbackCalled(false)
   {}
 
   NS_IMETHOD
   OnPushEndpoint(nsresult aStatus, const nsAString& aEndpoint) override
   {
     AssertIsOnMainThread();
-    mCallbackCalled = true;
 
     if (!mProxy) {
       return NS_OK;
@@ -508,16 +499,11 @@ public:
 
 protected:
   ~GetSubscriptionCallback()
-  {
-    // Enforces that GetSubscriptionRunnable uses the callback for error
-    // reporting once it creates the callback.
-    MOZ_ASSERT(mCallbackCalled);
-  }
+  {}
 
 private:
   nsRefPtr<PromiseWorkerProxy> mProxy;
   nsString mScope;
-  DebugOnly<bool> mCallbackCalled;
 };
 
 NS_IMPL_ISUPPORTS(GetSubscriptionCallback, nsIPushEndpointCallback)