fork content version between ns-branded builds and mozilla builds.

security/nss/lib/certdb/certdb.h

@@ -42,7 +42,11 @@
 
 /* version number of certificate database */
 #define CERT_DB_FILE_VERSION		7
+#ifdef USE_NS_ROOTS
+#define CERT_DB_CONTENT_VERSION		23
+#else
 #define CERT_DB_CONTENT_VERSION		2
+#endif
 
 #define SEC_DB_ENTRY_HEADER_LEN		3
 #define SEC_DB_KEY_HEADER_LEN		1

security/nss/lib/certdb/manifest.mn

@@ -49,6 +49,7 @@ MODULE = security
 
 ifdef MOZILLA_SECURITY_BUILD
 CERTINIT=nscertinit.c
+DEFINES += -DUSE_NS_ROOTS
 else
 CERTINIT=certinit.c
 endif