backing out all my patches from yesterday, 399043 398549 399022 399045 345665

git-svn-id: svn://10.0.0.236/trunk@237838 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/security/manager/ssl/src/nsNSSModule.cpp

@@ -24,7 +24,6 @@
  *   Hubbie Shaw
  *   Doug Turner <dougt@netscape.com>
  *   Brian Ryner <bryner@brianryner.com>
- *   Kai Engert <kengert@redhat.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -75,7 +74,6 @@
 #include "nsDataSignatureVerifier.h"
 #include "nsCertOverrideService.h"
 #include "nsRandomGenerator.h"
-#include "nsRecentBadCerts.h"
 
 // We must ensure that the nsNSSComponent has been loaded before
 // creating any other components.
@@ -198,7 +196,6 @@ NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(PR_FALSE, nsKeyObjectFactory)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(PR_FALSE, nsDataSignatureVerifier)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR_INIT(PR_FALSE, nsCertOverrideService, Init)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(PR_FALSE, nsRandomGenerator)
-NS_NSS_GENERIC_FACTORY_CONSTRUCTOR_INIT(PR_FALSE, nsRecentBadCertsService, Init)
 
 static NS_METHOD RegisterPSMContentListeners(
                       nsIComponentManager *aCompMgr,
@@ -475,13 +472,6 @@ static const nsModuleComponentInfo components[] =
     NS_RANDOMGENERATOR_CID,
     NS_RANDOMGENERATOR_CONTRACTID,
     nsRandomGeneratorConstructor
-  },
-
-  {
-    "PSM Recent Bad Certs Service",
-    NS_RECENTBADCERTS_CID,
-    NS_RECENTBADCERTS_CONTRACTID,
-    nsRecentBadCertsServiceConstructor
   }
 };