b=168946 More PSM cleanup

r=javi sr=rpotts

security/manager/ssl/public/nsIX509Cert.idl

@@ -132,13 +132,3 @@ interface nsIX509Cert : nsISupports {
 
   boolean isSameCert(in nsIX509Cert other);
 };
-
-%{C++
-
-#define NS_X509CERT_CID { 0xf0980f60, 0xee3d, 0x11d4, \
-                         { 0x99, 0x8b, 0x00, 0xb0, 0xd0, 0x23, 0x54, 0xa0 } }
-
-#define NS_X509CERT_CONTRACTID "@mozilla.org/security/x509cert;1"
-
-%}
-

security/manager/ssl/public/nsIX509CertDB.idl

@@ -41,13 +41,6 @@ interface nsILocalFile;
 interface nsIInterfaceRequestor;
 
 %{C++
-#define NS_X509CERTDB_CID { /* da48b3c0-1284-11d5-ac67-000064657374 */ \
-    0xda48b3c0,                                                        \
-    0x1284,                                                            \
-    0x11d5,                                                            \
-    {0xac, 0x67, 0x00, 0x00, 0x64, 0x65, 0x73, 0x74}                   \
-  }
-
 #define NS_X509CERTDB_CONTRACTID "@mozilla.org/security/x509certdb;1"
 %}
 

security/manager/ssl/src/nsNSSCertificateDB.h

@@ -68,5 +68,11 @@ private:
                                 nsIInterfaceRequestor *ctx);
 };
 
+#define NS_X509CERTDB_CID { /* fb0bbc5c-452e-4783-b32c-80124693d871 */ \
+    0xfb0bbc5c,                                                        \
+    0x452e,                                                            \
+    0x4783,                                                            \
+    {0xb3, 0x2c, 0x80, 0x12, 0x46, 0x93, 0xd8, 0x71}                   \
+  }
 
 #endif