4 files changed, 3 insertions, 56 deletions
diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp
index 28d57a501..e72e95a61 100644
--- a/dom/base/Navigator.cpp
+++ b/dom/base/Navigator.cpp
@@ -1331,14 +1331,9 @@ Navigator::HasUserMediaSupport(JSContext* /* unused */,
 bool
 Navigator::IsE10sEnabled(JSContext* aCx, JSObject* aGlobal)
 {
-  return XRE_IsContentProcess();
-}
-
-bool
-Navigator::MozE10sEnabled()
-{
-  // This will only be called if IsE10sEnabled() is true.
-  return true;
+  // We no longer support this, so always false.
+  // TODO: Remove this.
+  return false;
 }
 
 /* static */
diff --git a/dom/base/Navigator.h b/dom/base/Navigator.h
index 953ef8c6c..a1c4794c4 100644
--- a/dom/base/Navigator.h
+++ b/dom/base/Navigator.h
@@ -211,8 +211,6 @@ public:
 
   void GetLanguages(nsTArray<nsString>& aLanguages);
 
-  bool MozE10sEnabled();
-
   StorageManager* Storage();
 
   static void GetAcceptLanguages(nsTArray<nsString>& aLanguages);
diff --git a/dom/quota/ActorsParent.cpp b/dom/quota/ActorsParent.cpp
index c240cbf20..74d57c5db 100644
--- a/dom/quota/ActorsParent.cpp
+++ b/dom/quota/ActorsParent.cpp
@@ -3799,37 +3799,6 @@ QuotaManager::InitializeRepository(PersistenceType aPersistenceType)
   return NS_OK;
 }
 
-namespace {
-
-// The Cache API was creating top level morgue directories by accident for
-// a short time in nightly.  This unfortunately prevents all storage from
-// working.  So recover these profiles by removing these corrupt directories.
-// This should be removed at some point in the future.
-bool
-MaybeRemoveCorruptDirectory(const nsAString& aLeafName, nsIFile* aDir)
-{
-#ifdef NIGHTLY_BUILD
-  MOZ_ASSERT(aDir);
-
-  if (aLeafName != NS_LITERAL_STRING("morgue")) {
-    return false;
-  }
-
-  NS_WARNING("QuotaManager removing corrupt morgue directory!");
-
-  nsresult rv = aDir->Remove(true /* recursive */);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return false;
-  }
-
-  return true;
-#else
-  return false;
-#endif // NIGHTLY_BUILD
-}
-
-} // namespace
-
 nsresult
 QuotaManager::InitializeOrigin(PersistenceType aPersistenceType,
                                const nsACString& aGroup,
@@ -3883,10 +3852,6 @@ QuotaManager::InitializeOrigin(PersistenceType aPersistenceType,
       return NS_ERROR_UNEXPECTED;
     }
 
-    if (MaybeRemoveCorruptDirectory(leafName, file)) {
-      continue;
-    }
-
     Client::Type clientType;
     rv = Client::TypeFromText(leafName, clientType);
     if (NS_FAILED(rv)) {
@@ -5981,10 +5946,6 @@ QuotaUsageRequestBase::GetUsageForOrigin(QuotaManager* aQuotaManager,
         }
       }
 
-      if (MaybeRemoveCorruptDirectory(leafName, file)) {
-        continue;
-      }
-
       Client::Type clientType;
       rv = Client::TypeFromText(leafName, clientType);
       if (NS_FAILED(rv)) {
diff --git a/dom/webidl/Navigator.webidl b/dom/webidl/Navigator.webidl
index 888aae219..de89080fc 100644
--- a/dom/webidl/Navigator.webidl
+++ b/dom/webidl/Navigator.webidl
@@ -304,13 +304,6 @@ partial interface Navigator {
   readonly attribute LegacyMozTCPSocket mozTCPSocket;
 };
 
-#ifdef NIGHTLY_BUILD
-partial interface Navigator {
-  [Func="Navigator::IsE10sEnabled"]
-  readonly attribute boolean mozE10sEnabled;
-};
-#endif
-
 [NoInterfaceObject, Exposed=(Window,Worker)]
 interface NavigatorConcurrentHardware {
   readonly attribute unsigned long long hardwareConcurrency;