Bug 1665295 - Remove unnecessary assertion on getting nsICertStorage on AppShutdown. r=keeler
authorBenjamin Beurdouche <benjamin.beurdouche@inria.fr>
Tue, 27 Oct 2020 15:24:46 +0000
changeset 554710 39d269f4a596958c25c73da9e7da57f7f390851b
parent 554709 5362c99dfe66bb3bf7077415e99e2a45d5ac4fa3
child 554711 3ce0c491985b902d28221414357d62e6f38b5923
push id37898
push userabutkovits@mozilla.com
push dateWed, 28 Oct 2020 09:24:21 +0000
treeherdermozilla-central@83bf4fd3b1fb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskeeler
bugs1665295
milestone84.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1665295 - Remove unnecessary assertion on getting nsICertStorage on AppShutdown. r=keeler Differential Revision: https://phabricator.services.mozilla.com/D91890
xpcom/base/AppShutdown.cpp
--- a/xpcom/base/AppShutdown.cpp
+++ b/xpcom/base/AppShutdown.cpp
@@ -159,17 +159,16 @@ void AppShutdown::MaybeFastShutdown(Shut
     nsresult rv;
 #ifdef MOZ_NEW_XULSTORE
     rv = XULStore::Shutdown();
     NS_ASSERTION(NS_SUCCEEDED(rv), "XULStore::Shutdown() failed.");
 #endif
 
     nsCOMPtr<nsICertStorage> certStorage =
         do_GetService("@mozilla.org/security/certstorage;1", &rv);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Could not get nsICertStorage");
     if (NS_SUCCEEDED(rv)) {
       SpinEventLoopUntil([&]() {
         int32_t remainingOps;
         nsresult rv = certStorage->GetRemainingOperationCount(&remainingOps);
         NS_ASSERTION(NS_SUCCEEDED(rv),
                      "nsICertStorage::getRemainingOperationCount failed during "
                      "shutdown");
         return NS_FAILED(rv) || remainingOps <= 0;