Reland: Fix imported server certs being distrusted in NSS 3.13.

chrome/browser/certificate_manager_model.cc

Index: chrome/browser/certificate_manager_model.cc
diff --git a/chrome/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc
index 22af7e87ae63910adaadfcdd5d29496262915ef5..e44a0b6dfd6b5f38eb393f8e317e7a4685380319 100644
--- a/chrome/browser/certificate_manager_model.cc
+++ b/chrome/browser/certificate_manager_model.cc
@@ -131,8 +131,10 @@ bool CertificateManagerModel::ImportCACerts(
 
 bool CertificateManagerModel::ImportServerCert(
     const net::CertificateList& certificates,
+    net::CertDatabase::TrustBits trust_bits,
     net::CertDatabase::ImportCertFailureList* not_imported) {
-  bool result = cert_db_.ImportServerCert(certificates, not_imported);
+  bool result = cert_db_.ImportServerCert(certificates, trust_bits,
+                                          not_imported);
   if (result && not_imported->size() != certificates.size())
     Refresh();
   return result;