From 686753c8298182d32f58e69d12d7c3eabdf57fbd Mon Sep 17 00:00:00 2001
From: Tom Tung <shes050117@gmail.com>
Date: Tue, 24 Sep 2019 18:01:32 +0000
Subject: [PATCH] Bug 1398167 - Remove the temporary fix for not upgrading
 shema version from 25 to 26; r=asuth

Differential Revision: https://phabricator.services.mozilla.com/D46905

--HG--
extra : moz-landing-system : lando
---
 dom/cache/DBSchema.cpp | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/dom/cache/DBSchema.cpp b/dom/cache/DBSchema.cpp
index 4db507b2cb55..7952b70580c0 100644
--- a/dom/cache/DBSchema.cpp
+++ b/dom/cache/DBSchema.cpp
@@ -2511,17 +2511,7 @@ nsresult ReadResponse(mozIStorageConnection* aConn, EntryId aEntryId,
     return rv;
   }
 
-#ifdef NIGHTLY_BUILD
-  bool shouldUpdateTo26 = false;
-  if (nullPadding && aSavedResponseOut->mValue.type() == ResponseType::Opaque) {
-    // XXXtt: This should be removed in the future (e.g. Nightly 58) by
-    // bug 1398167.
-    shouldUpdateTo26 = true;
-    aSavedResponseOut->mValue.paddingSize() = 0;
-  } else if (nullPadding) {
-#else
   if (nullPadding) {
-#endif  // NIGHTLY_BUILD
     MOZ_DIAGNOSTIC_ASSERT(aSavedResponseOut->mValue.type() !=
                           ResponseType::Opaque);
     aSavedResponseOut->mValue.paddingSize() =
@@ -2545,21 +2535,6 @@ nsresult ReadResponse(mozIStorageConnection* aConn, EntryId aEntryId,
     return rv;
   }
 
-#ifdef NIGHTLY_BUILD
-  if (shouldUpdateTo26) {
-    // XXXtt: This is a quick fix for not updating properly in Nightly 57.
-    // Note: This should be removed in the future (e.g. Nightly 58) by
-    // bug 1398167.
-    rv = aConn->ExecuteSimpleSQL(
-        NS_LITERAL_CSTRING("UPDATE entries SET response_padding_size = 0 "
-                           "WHERE response_type = 4 "  // opaque response
-                           "AND response_padding_size IS NULL"));
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-  }
-#endif  // NIGHTLY_BUILD
-
   rv = aConn->CreateStatement(NS_LITERAL_CSTRING("SELECT "
                                                  "name, "
                                                  "value "