Backed out changeset 89ffaadaf58b (bug 1389561) for disabling assertion. r=backout a=backout

dom/quota/ActorsParent.cpp

@@ -538,7 +538,7 @@ private:
   {
     MOZ_COUNT_DTOR(OriginInfo);
 
-    MOZ_DIAGNOSTIC_ASSERT(!mQuotaObjects.Count());
+    MOZ_ASSERT(!mQuotaObjects.Count());
   }
 
   void
@@ -3136,10 +3136,9 @@ QuotaObject::LockedMaybeUpdateSize(int64_t aSize, bool aTruncate)
       MOZ_ASSERT(!lock->GetGroup().IsEmpty());
       MOZ_ASSERT(lock->GetOriginScope().IsOrigin());
       MOZ_ASSERT(!lock->GetOriginScope().GetOrigin().IsEmpty());
-      MOZ_DIAGNOSTIC_ASSERT(
-             !(lock->GetOriginScope().GetOrigin() == mOriginInfo->mOrigin &&
-             lock->GetPersistenceType().Value() == groupInfo->mPersistenceType),
-             "Deleted itself!");
+      MOZ_ASSERT(!(lock->GetOriginScope().GetOrigin() == mOriginInfo->mOrigin &&
+                   lock->GetPersistenceType().Value() == groupInfo->mPersistenceType),
+                 "Deleted itself!");
 
       quotaManager->LockedRemoveQuotaForOrigin(
                                              lock->GetPersistenceType().Value(),
@@ -3482,8 +3481,8 @@ QuotaManager::CollectOriginsForEviction(
         }
 
         if (!match) {
-          MOZ_DIAGNOSTIC_ASSERT(!originInfo->mQuotaObjects.Count(),
-                                "Inactive origin shouldn't have open files!");
+          MOZ_ASSERT(!originInfo->mQuotaObjects.Count(),
+                     "Inactive origin shouldn't have open files!");
           aInactiveOriginInfos.InsertElementSorted(originInfo,
                                                    OriginInfoLRUComparator());
         }