Bug 1331949 Make service worker and cache diagnostic assert code compile on beta. r=asuth

dom/cache/DBSchema.cpp

@@ -2553,7 +2553,7 @@ Migrate(mozIStorageConnection* aConn)
       }
     }
 
-#if !defined(RELEASE_OR_BETA)
+#if defined(DEBUG) || !defined(RELEASE_OR_BETA)
     int32_t lastVersion = currentVersion;
 #endif
     rv = aConn->GetSchemaVersion(&currentVersion);

dom/cache/Manager.cpp

@@ -1526,7 +1526,7 @@ Manager::ReleaseCacheId(CacheId aCacheId)
   NS_ASSERT_OWNINGTHREAD(Manager);
   for (uint32_t i = 0; i < mCacheIdRefs.Length(); ++i) {
     if (mCacheIdRefs[i].mCacheId == aCacheId) {
-#if !defined(RELEASE_OR_BETA)
+#if defined(DEBUG) || !defined(RELEASE_OR_BETA)
       uint32_t oldRef = mCacheIdRefs[i].mCount;
 #endif
       mCacheIdRefs[i].mCount -= 1;
@@ -1577,7 +1577,7 @@ Manager::ReleaseBodyId(const nsID& aBodyId)
   NS_ASSERT_OWNINGTHREAD(Manager);
   for (uint32_t i = 0; i < mBodyIdRefs.Length(); ++i) {
     if (mBodyIdRefs[i].mBodyId == aBodyId) {
-#if !defined(RELEASE_OR_BETA)
+#if defined(DEBUG) || !defined(RELEASE_OR_BETA)
       uint32_t oldRef = mBodyIdRefs[i].mCount;
 #endif
       mBodyIdRefs[i].mCount -= 1;

dom/cache/StreamControl.cpp

@@ -45,7 +45,7 @@ void
 StreamControl::CloseReadStreams(const nsID& aId)
 {
   AssertOwningThread();
-#if !defined(RELEASE_OR_BETA)
+#if defined(DEBUG) || !defined(RELEASE_OR_BETA)
   uint32_t closedCount = 0;
 #endif
 
@@ -54,7 +54,9 @@ StreamControl::CloseReadStreams(const nsID& aId)
     RefPtr<ReadStream::Controllable> stream = iter.GetNext();
     if (stream->MatchId(aId)) {
       stream->CloseStream();
+#if defined(DEBUG) || !defined(RELEASE_OR_BETA)
       closedCount += 1;
+#endif
     }
   }
 

dom/workers/test/gtest/TestReadWrite.cpp

@@ -24,9 +24,14 @@ class ServiceWorkerRegistrarTest : public ServiceWorkerRegistrar
 public:
   ServiceWorkerRegistrarTest()
   {
+#if defined(DEBUG) || !defined(RELEASE_OR_BETA)
     nsresult rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
                                        getter_AddRefs(mProfileDir));
     MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
+#else
+    NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
+                           getter_AddRefs(mProfileDir));
+#endif
     MOZ_DIAGNOSTIC_ASSERT(mProfileDir);
   }