| Index: chromeos/network/certificate_handler.cc
|
| diff --git a/chromeos/network/certificate_handler.cc b/chromeos/network/certificate_handler.cc
|
| index d471813a47c8de16e25578856d7a00e6fba810a2..f547b0aa4c047c81bdd4c98a033a12a0db2f70e6 100644
|
| --- a/chromeos/network/certificate_handler.cc
|
| +++ b/chromeos/network/certificate_handler.cc
|
| @@ -19,14 +19,16 @@ CertificateHandler::~CertificateHandler() {
|
| bool CertificateHandler::ImportCertificates(
|
| const base::ListValue& certificates,
|
| onc::ONCSource source,
|
| - net::CertificateList* onc_trusted_certificates) {
|
| + net::CertificateList* onc_trusted_certificates,
|
| + CertsByGUID* imported_server_and_ca_certs) {
|
| VLOG(2) << "ONC file has " << certificates.GetSize() << " certificates";
|
|
|
| // Web trust is only granted to certificates imported by the user.
|
| bool allow_trust_imports = source == onc::ONC_SOURCE_USER_IMPORT;
|
| onc::CertificateImporter cert_importer(allow_trust_imports);
|
| if (cert_importer.ParseAndStoreCertificates(
|
| - certificates, onc_trusted_certificates) !=
|
| + certificates, onc_trusted_certificates,
|
| + imported_server_and_ca_certs) !=
|
| onc::CertificateImporter::IMPORT_OK) {
|
| LOG(ERROR) << "Cannot parse some of the certificates in the ONC from "
|
| << onc::GetSourceAsString(source);
|
|
|