Backed out changeset 653fc39e223e (bug 769288)
authorJosh Matthews <josh@joshmatthews.net>
Fri, 07 Dec 2012 19:45:55 -0500
changeset 115313 286604e4b3a0
parent 115312 e49e075893b1
child 115314 4d91e9934e57
push id23998
push userjosh@joshmatthews.net
push date2012-12-08 00:46 +0000
treeherdermozilla-central@32638e411218 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs769288
milestone20.0a1
backs out653fc39e223e
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
Backed out changeset 653fc39e223e (bug 769288)
security/manager/ssl/src/nsCertOverrideService.cpp
--- a/security/manager/ssl/src/nsCertOverrideService.cpp
+++ b/security/manager/ssl/src/nsCertOverrideService.cpp
@@ -119,17 +119,16 @@ nsCertOverrideService::Init()
       mozilla::services::GetObserverService();
 
   // If we cannot add ourselves as a profile change observer, then we will not
   // attempt to read/write any settings file. Otherwise, we would end up
   // reading/writing the wrong settings file after a profile change.
   if (observerService) {
     observerService->AddObserver(this, "profile-before-change", true);
     observerService->AddObserver(this, "profile-do-change", true);
-    observerService->AddObserver(this, "last-pb-context-exited", true);
     // simulate a profile change so we read the current profile's settings file
     Observe(nullptr, "profile-do-change", nullptr);
   }
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -164,20 +163,16 @@ nsCertOverrideService::Observe(nsISuppor
     nsresult rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(mSettingsFile));
     if (NS_SUCCEEDED(rv)) {
       mSettingsFile->AppendNative(NS_LITERAL_CSTRING(kCertOverrideFileName));
     } else {
       mSettingsFile = nullptr;
     }
     Read();
 
-  } else if (!nsCRT::strcmp(aTopic, "last-pb-context-exited")) {
-    ClearValidityOverride(
-        NS_LITERAL_CSTRING("all:temporary-certificates"),
-        0);
   }
 
   return NS_OK;
 }
 
 void
 nsCertOverrideService::RemoveAllFromMemory()
 {