DOMUI Cert Manager: merge email certs into other certs tab.

net/third_party/mozilla_security_manager/nsNSSCertificateDB.cpp

Index: net/third_party/mozilla_security_manager/nsNSSCertificateDB.cpp
diff --git a/net/third_party/mozilla_security_manager/nsNSSCertificateDB.cpp b/net/third_party/mozilla_security_manager/nsNSSCertificateDB.cpp
index f4ec31ac68a9cf079da2c2f4b681f1236d9bf7e1..4b49929121a2162e2ccbebc7645bc383e1212f67 100644
--- a/net/third_party/mozilla_security_manager/nsNSSCertificateDB.cpp
+++ b/net/third_party/mozilla_security_manager/nsNSSCertificateDB.cpp
@@ -221,15 +221,8 @@ SetCertTrust(const net::X509Certificate* cert,
     srv = CERT_ChangeCertTrust(CERT_GetDefaultCertDB(),
                                nsscert,
                                trust.GetTrust());
-  } else if (type == net::EMAIL_CERT) {
-    // always start with untrusted and move up
-    trust.SetValidPeer();
-    trust.AddPeerTrust(0, trusted & net::CertDatabase::TRUSTED_EMAIL, 0);
-    srv = CERT_ChangeCertTrust(CERT_GetDefaultCertDB(),
-                               nsscert,
-                               trust.GetTrust());
   } else {
-    // ignore user certs
+    // ignore user and email/unknown certs
     return true;
   }
   if (srv != SECSuccess)