Index: chrome/browser/ui/webui/settings/certificates_handler.cc |
diff --git a/chrome/browser/ui/webui/settings/certificates_handler.cc b/chrome/browser/ui/webui/settings/certificates_handler.cc |
index 405b95973927e2b3265b87b64ea8e03182929c97..462257144ea7a564e088a49df29f0ccaad0a82e7 100644 |
--- a/chrome/browser/ui/webui/settings/certificates_handler.cc |
+++ b/chrome/browser/ui/webui/settings/certificates_handler.cc |
@@ -1042,7 +1042,7 @@ void CertificatesHandler::PopulateTree( |
for (CertificateManagerModel::OrgGroupingMap::iterator i = map.begin(); |
i != map.end(); ++i) { |
// Populate first level (org name). |
- base::DictionaryValue* dict = new base::DictionaryValue; |
+ std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue); |
dict->SetString(kKeyField, OrgNameToId(i->first)); |
dict->SetString(kNameField, i->first); |
@@ -1050,7 +1050,8 @@ void CertificatesHandler::PopulateTree( |
base::ListValue* subnodes = new base::ListValue; |
for (net::CertificateList::const_iterator org_cert_it = i->second.begin(); |
org_cert_it != i->second.end(); ++org_cert_it) { |
- base::DictionaryValue* cert_dict = new base::DictionaryValue; |
+ std::unique_ptr<base::DictionaryValue> cert_dict( |
+ new base::DictionaryValue); |
net::X509Certificate* cert = org_cert_it->get(); |
cert_dict->SetString(kKeyField, cert_id_map_->CertToId(cert)); |
cert_dict->SetString( |
@@ -1074,12 +1075,12 @@ void CertificatesHandler::PopulateTree( |
kExtractableField, |
!certificate_manager_model_->IsHardwareBacked(cert)); |
// TODO(mattm): Other columns. |
- subnodes->Append(cert_dict); |
+ subnodes->Append(std::move(cert_dict)); |
} |
std::sort(subnodes->begin(), subnodes->end(), comparator); |
dict->Set(kSubnodesField, subnodes); |
- nodes->Append(dict); |
+ nodes->Append(std::move(dict)); |
} |
std::sort(nodes->begin(), nodes->end(), comparator); |
@@ -1127,11 +1128,11 @@ void CertificatesHandler::RejectCallbackWithImportError( |
base::WrapUnique(new base::ListValue()); |
for (size_t i = 0; i < not_imported.size(); ++i) { |
const net::NSSCertDatabase::ImportCertFailure& failure = not_imported[i]; |
- base::DictionaryValue* dict = new base::DictionaryValue; |
+ std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue); |
dict->SetString(kNameField, |
failure.certificate->subject().GetDisplayName()); |
dict->SetString(kErrorField, NetErrorToString(failure.net_error)); |
- cert_error_list->Append(dict); |
+ cert_error_list->Append(std::move(dict)); |
} |
std::unique_ptr<base::DictionaryValue> error_info(new base::DictionaryValue); |