Bug 1116559 - Remove the code to handle shutdown-cleanse from the cert override service code; r=keeler
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 30 Dec 2014 14:47:15 -0500
changeset 222172 d0d8a0b73ac8b78f5d2f3b50175adb576ccdcb7a
parent 222171 eb47315f8acb0ba9fbff0bc421d842f31d08d404
child 222173 9ea0c21e8e33a434642d8c03a6b939e29200bccc
push id28059
push userryanvm@gmail.com
push dateTue, 06 Jan 2015 15:53:01 +0000
treeherdermozilla-central@4d91c33b351c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskeeler
bugs1116559
milestone37.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 1116559 - Remove the code to handle shutdown-cleanse from the cert override service code; r=keeler shutdown-cleanse has not been a thing for quite a while.
security/manager/ssl/src/nsCertOverrideService.cpp
--- a/security/manager/ssl/src/nsCertOverrideService.cpp
+++ b/security/manager/ssl/src/nsCertOverrideService.cpp
@@ -129,28 +129,17 @@ nsCertOverrideService::Observe(nsISuppor
                                const char      *aTopic,
                                const char16_t *aData)
 {
   // check the topic
   if (!nsCRT::strcmp(aTopic, "profile-before-change")) {
     // The profile is about to change,
     // or is going away because the application is shutting down.
 
-    ReentrantMonitorAutoEnter lock(monitor);
-
-    if (!nsCRT::strcmp(aData, MOZ_UTF16("shutdown-cleanse"))) {
-      RemoveAllFromMemory();
-      // delete the storage file
-      if (mSettingsFile) {
-        mSettingsFile->Remove(false);
-      }
-    } else {
-      RemoveAllFromMemory();
-    }
-
+    RemoveAllFromMemory();
   } else if (!nsCRT::strcmp(aTopic, "profile-do-change")) {
     // The profile has already changed.
     // Now read from the new profile location.
     // we also need to update the cached file location
 
     ReentrantMonitorAutoEnter lock(monitor);
 
     nsresult rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(mSettingsFile));