Backing out code from bug 102633 and the unsuccessful fix attempt from bug 137530, because the UI does not work as expected.

r=javi / sr=alecf for backing out


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

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

@@ -46,7 +46,6 @@
 #include "nsCertPicker.h"
 #include "nsCURILoader.h"
 #include "nsICategoryManager.h"
-#include "nsCipherInfo.h"
 
 // We must ensure that the nsNSSComponent has been loaded before
 // creating any other components.
@@ -156,7 +155,6 @@ NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(PR_FALSE, nsCMSEncoder)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(PR_FALSE, nsCMSMessage)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(PR_FALSE, nsHash)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(PR_FALSE, nsCertPicker)
-NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(PR_FALSE, nsCipherInfoService)
 
 static NS_METHOD RegisterPSMContentListeners(
                       nsIComponentManager *aCompMgr,
@@ -342,13 +340,6 @@ static const nsModuleComponentInfo components[] =
     "@mozilla.org/uriloader/psm-external-content-listener;1",
     PSMContentListenerConstructor,
     RegisterPSMContentListeners
-  },
-  
-  {
-    "PSM Cipher Info",
-    NS_CIPHERINFOSERVICE_CID,
-    NS_CIPHERINFOSERVICE_CONTRACTID,
-    nsCipherInfoServiceConstructor
   }
 };