diff --git a/dom/cache/Context.cpp b/dom/cache/Context.cpp index 7163a17e99f6..06ee53e326c9 100644 --- a/dom/cache/Context.cpp +++ b/dom/cache/Context.cpp @@ -912,7 +912,10 @@ void Context::CancelAll() { } mState = STATE_CONTEXT_CANCELED; - mPendingActions.Clear(); + // Allow completion of pending actions in Context::OnQuotaInit + if (!mInitRunnable) { + mPendingActions.Clear(); + } for (const auto& activity : mActivityList.ForwardRange()) { activity->Cancel(); } diff --git a/dom/cache/test/xpcshell/xpcshell.toml b/dom/cache/test/xpcshell/xpcshell.toml index 7cb567f22add..00299bd830fa 100644 --- a/dom/cache/test/xpcshell/xpcshell.toml +++ b/dom/cache/test/xpcshell/xpcshell.toml @@ -25,6 +25,5 @@ skip-if = ["true"] ["test_schema_26_upgrade.js"] ["test_slowDatabaseInitialization.js"] -skip-if = ["true"] ["test_slowStorageInitialization.js"]