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

chrome/browser/ui/webui/options2/certificate_manager_handler2.cc

Index: chrome/browser/ui/webui/options2/certificate_manager_handler2.cc
diff --git a/chrome/browser/ui/webui/options2/certificate_manager_handler2.cc b/chrome/browser/ui/webui/options2/certificate_manager_handler2.cc
index a8ed12492e6d94f9de29b9e783901f4990beecb3..707ea970cb8b7dd49fd19a909663f80142db7550 100644
--- a/chrome/browser/ui/webui/options2/certificate_manager_handler2.cc
+++ b/chrome/browser/ui/webui/options2/certificate_manager_handler2.cc
@@ -810,8 +810,10 @@ void CertificateManagerHandler::ImportServerFileRead(int read_errno,
   }
 
   net::CertDatabase::ImportCertFailureList not_imported;
+  // TODO(mattm): Add UI for trust. http://crbug.com/76274
   bool result = certificate_manager_model_->ImportServerCert(
       selected_cert_list_,
+      net::CertDatabase::TRUST_DEFAULT,
       &not_imported);
   if (!result) {
     ShowError(
@@ -890,6 +892,8 @@ void CertificateManagerHandler::ImportCATrustSelected(const ListValue* args) {
     return;
   }
 
+  // TODO(mattm): add UI for setting explicit distrust, too.
+  // http://crbug.com/128411
   net::CertDatabase::ImportCertFailureList not_imported;
   bool result = certificate_manager_model_->ImportCACerts(
       selected_cert_list_,