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

chrome/browser/certificate_manager_model.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/certificate_manager_model.h"
 
 #include "base/bind.h"
 #include "base/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 113 matching lines @@
     net::CertDatabase::TrustBits trust_bits,
     net::CertDatabase::ImportCertFailureList* not_imported) {
   bool result = cert_db_.ImportCACerts(certificates, trust_bits, not_imported);
   if (result && not_imported->size() != certificates.size())
     Refresh();
   return result;
 }
 
 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;
 }
 
 bool CertificateManagerModel::SetCertTrust(
     const net::X509Certificate* cert,
     net::CertType type,
     net::CertDatabase::TrustBits trust_bits) {
   return cert_db_.SetCertTrust(cert, type, trust_bits);
 }
 
 bool CertificateManagerModel::Delete(net::X509Certificate* cert) {
   bool result = cert_db_.DeleteCertAndKey(cert);
   if (result)
     Refresh();
   return result;
 }
 
 bool CertificateManagerModel::IsHardwareBacked(
     const net::X509Certificate* cert) const {
 #if defined(OS_CHROMEOS)
   return crypto::IsTPMTokenReady() &&
          cert->os_cert_handle()->slot ==
              cert_db().GetPrivateModule()->os_module_handle();
 #else
   return false;
 #endif
 }