Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9062)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/webui/certificate_viewer_webui.cc

Issue 2740143002: Change base::Value::ListStorage to std::vector<base::Value> (Closed)
Patch Set: Comment Updates Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/extensions/menu_manager.cc ('K') | « chrome/browser/ui/webui/browsing_history_handler.cc ('k') | chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc » ('j') | chromecast/crash/linux/crash_testing_utils.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/certificate_viewer_webui.cc
diff --git a/chrome/browser/ui/webui/certificate_viewer_webui.cc b/chrome/browser/ui/webui/certificate_viewer_webui.cc
index 1ab60ce8fe4fd98d068cd496b386bca0727a0359..a389944c8617a8ac02ef010389b71949ba22193c 100644
--- a/chrome/browser/ui/webui/certificate_viewer_webui.cc
+++ b/chrome/browser/ui/webui/certificate_viewer_webui.cc
@@ -291,26 +291,28 @@ void CertificateViewerDialogHandler::RequestCertificateFields(
net::X509Certificate::OSCertHandle cert = cert_chain_[cert_index];
+ // In the following the list.Append(...); list.GetDictionary(...); pattern is
+ // necessary to obtain a raw dict pointer to the last element of the list.
base::ListValue root_list;
base::DictionaryValue* node_details;
base::DictionaryValue* alt_node_details;
base::ListValue* cert_sub_fields;
- root_list.Append(
- base::WrapUnique(node_details = new base::DictionaryValue()));
+ root_list.Append(base::MakeUnique<base::DictionaryValue>());
+ root_list.GetDictionary(root_list.GetSize() - 1, &node_details);
flackr 2017/03/15 15:29:39 I think this would be a lot cleaner and more effic
jdoerrie 2017/03/23 18:11:17 Done. This turned out to be quite tricky with the
flackr 2017/03/23 19:23:57 I see that, thanks for bearing with me on this. I
node_details->SetString("label", x509_certificate_model::GetTitle(cert));
base::ListValue* cert_fields;
node_details->Set("children", cert_fields = new base::ListValue());
- cert_fields->Append(
- base::WrapUnique(node_details = new base::DictionaryValue()));
+ cert_fields->Append(base::MakeUnique<base::DictionaryValue>());
+ cert_fields->GetDictionary(cert_fields->GetSize() - 1, &node_details);
node_details->SetString("label",
l10n_util::GetStringUTF8(IDS_CERT_DETAILS_CERTIFICATE));
node_details->Set("children", cert_fields = new base::ListValue());
// Main certificate fields.
- cert_fields->Append(
- base::WrapUnique(node_details = new base::DictionaryValue()));
+ cert_fields->Append(base::MakeUnique<base::DictionaryValue>());
+ cert_fields->GetDictionary(cert_fields->GetSize() - 1, &node_details);
node_details->SetString("label",
l10n_util::GetStringUTF8(IDS_CERT_DETAILS_VERSION));
std::string version = x509_certificate_model::GetVersion(cert);
@@ -319,41 +321,45 @@ void CertificateViewerDialogHandler::RequestCertificateFields(
l10n_util::GetStringFUTF8(IDS_CERT_DETAILS_VERSION_FORMAT,
base::UTF8ToUTF16(version)));
- cert_fields->Append(
- base::WrapUnique(node_details = new base::DictionaryValue()));
+ cert_fields->Append(base::MakeUnique<base::DictionaryValue>());
+ cert_fields->GetDictionary(cert_fields->GetSize() - 1, &node_details);
node_details->SetString("label",
l10n_util::GetStringUTF8(IDS_CERT_DETAILS_SERIAL_NUMBER));
node_details->SetString("payload.val",
x509_certificate_model::GetSerialNumberHexified(cert,
l10n_util::GetStringUTF8(IDS_CERT_INFO_FIELD_NOT_PRESENT)));
- cert_fields->Append(
- base::WrapUnique(node_details = new base::DictionaryValue()));
+ cert_fields->Append(base::MakeUnique<base::DictionaryValue>());
+ cert_fields->GetDictionary(cert_fields->GetSize() - 1, &node_details);
node_details->SetString("label",
l10n_util::GetStringUTF8(IDS_CERT_DETAILS_CERTIFICATE_SIG_ALG));
node_details->SetString("payload.val",
x509_certificate_model::ProcessSecAlgorithmSignature(cert));
- cert_fields->Append(
- base::WrapUnique(node_details = new base::DictionaryValue()));
+ cert_fields->Append(base::MakeUnique<base::DictionaryValue>());
+ cert_fields->GetDictionary(cert_fields->GetSize() - 1, &node_details);
node_details->SetString("label",
l10n_util::GetStringUTF8(IDS_CERT_DETAILS_ISSUER));
node_details->SetString("payload.val",
x509_certificate_model::GetIssuerName(cert));
// Validity period.
- cert_fields->Append(
- base::WrapUnique(node_details = new base::DictionaryValue()));
+ cert_fields->Append(base::MakeUnique<base::DictionaryValue>());
+ cert_fields->GetDictionary(cert_fields->GetSize() - 1, &node_details);
node_details->SetString("label",
l10n_util::GetStringUTF8(IDS_CERT_DETAILS_VALIDITY));
node_details->Set("children", cert_sub_fields = new base::ListValue());
- cert_sub_fields->Append(
- base::WrapUnique(node_details = new base::DictionaryValue()));
+ cert_sub_fields->Append(base::MakeUnique<base::DictionaryValue>());
+ cert_sub_fields->GetDictionary(cert_sub_fields->GetSize() - 1, &node_details);
node_details->SetString("label",
l10n_util::GetStringUTF8(IDS_CERT_DETAILS_NOT_BEFORE));
- cert_sub_fields->Append(
- base::WrapUnique(alt_node_details = new base::DictionaryValue()));
+ cert_sub_fields->Append(base::MakeUnique<base::DictionaryValue>());
+ // |Append| might have invalidated |node_details|, which is why it needs to be
+ // queried again.
+ cert_sub_fields->GetDictionary(cert_sub_fields->GetSize() - 2, &node_details);
+ cert_sub_fields->GetDictionary(cert_sub_fields->GetSize() - 1,
+ &alt_node_details);
alt_node_details->SetString("label",
l10n_util::GetStringUTF8(IDS_CERT_DETAILS_NOT_AFTER));
base::Time issued, expires;
@@ -368,28 +374,28 @@ void CertificateViewerDialogHandler::RequestCertificateFields(
base::TimeFormatShortDateAndTimeWithTimeZone(expires)));
}
- cert_fields->Append(
- base::WrapUnique(node_details = new base::DictionaryValue()));
+ cert_fields->Append(base::MakeUnique<base::DictionaryValue>());
+ cert_fields->GetDictionary(cert_fields->GetSize() - 1, &node_details);
node_details->SetString("label",
l10n_util::GetStringUTF8(IDS_CERT_DETAILS_SUBJECT));
node_details->SetString("payload.val",
x509_certificate_model::GetSubjectName(cert));
// Subject key information.
- cert_fields->Append(
- base::WrapUnique(node_details = new base::DictionaryValue()));
+ cert_fields->Append(base::MakeUnique<base::DictionaryValue>());
+ cert_fields->GetDictionary(cert_fields->GetSize() - 1, &node_details);
node_details->SetString("label",
l10n_util::GetStringUTF8(IDS_CERT_DETAILS_SUBJECT_KEY_INFO));
node_details->Set("children", cert_sub_fields = new base::ListValue());
- cert_sub_fields->Append(
- base::WrapUnique(node_details = new base::DictionaryValue()));
+ cert_sub_fields->Append(base::MakeUnique<base::DictionaryValue>());
+ cert_sub_fields->GetDictionary(cert_sub_fields->GetSize() - 1, &node_details);
node_details->SetString("label",
l10n_util::GetStringUTF8(IDS_CERT_DETAILS_SUBJECT_KEY_ALG));
node_details->SetString("payload.val",
x509_certificate_model::ProcessSecAlgorithmSubjectPublicKey(cert));
- cert_sub_fields->Append(
- base::WrapUnique(node_details = new base::DictionaryValue()));
+ cert_sub_fields->Append(base::MakeUnique<base::DictionaryValue>());
+ cert_sub_fields->GetDictionary(cert_sub_fields->GetSize() - 1, &node_details);
node_details->SetString("label",
l10n_util::GetStringUTF8(IDS_CERT_DETAILS_SUBJECT_KEY));
node_details->SetString("payload.val",
@@ -403,49 +409,49 @@ void CertificateViewerDialogHandler::RequestCertificateFields(
cert, &extensions);
if (!extensions.empty()) {
- cert_fields->Append(
- base::WrapUnique(node_details = new base::DictionaryValue()));
+ cert_fields->Append(base::MakeUnique<base::DictionaryValue>());
+ cert_fields->GetDictionary(cert_fields->GetSize() - 1, &node_details);
node_details->SetString("label",
l10n_util::GetStringUTF8(IDS_CERT_DETAILS_EXTENSIONS));
node_details->Set("children", cert_sub_fields = new base::ListValue());
for (x509_certificate_model::Extensions::const_iterator i =
extensions.begin(); i != extensions.end(); ++i) {
- cert_sub_fields->Append(
- base::WrapUnique(node_details = new base::DictionaryValue()));
+ cert_sub_fields->Append(base::MakeUnique<base::DictionaryValue>());
+ cert_sub_fields->GetDictionary(cert_fields->GetSize() - 1, &node_details);
node_details->SetString("label", i->name);
node_details->SetString("payload.val", i->value);
}
}
- cert_fields->Append(
- base::WrapUnique(node_details = new base::DictionaryValue()));
+ cert_fields->Append(base::MakeUnique<base::DictionaryValue>());
+ cert_fields->GetDictionary(cert_fields->GetSize() - 1, &node_details);
node_details->SetString("label",
l10n_util::GetStringUTF8(IDS_CERT_DETAILS_CERTIFICATE_SIG_ALG));
node_details->SetString("payload.val",
x509_certificate_model::ProcessSecAlgorithmSignatureWrap(cert));
- cert_fields->Append(
- base::WrapUnique(node_details = new base::DictionaryValue()));
+ cert_fields->Append(base::MakeUnique<base::DictionaryValue>());
+ cert_fields->GetDictionary(cert_fields->GetSize() - 1, &node_details);
node_details->SetString("label",
l10n_util::GetStringUTF8(IDS_CERT_DETAILS_CERTIFICATE_SIG_VALUE));
node_details->SetString("payload.val",
x509_certificate_model::ProcessRawBitsSignatureWrap(cert));
- cert_fields->Append(
- base::WrapUnique(node_details = new base::DictionaryValue()));
+ cert_fields->Append(base::MakeUnique<base::DictionaryValue>());
+ cert_fields->GetDictionary(cert_fields->GetSize() - 1, &node_details);
node_details->SetString("label",
l10n_util::GetStringUTF8(IDS_CERT_INFO_FINGERPRINTS_GROUP));
node_details->Set("children", cert_sub_fields = new base::ListValue());
- cert_sub_fields->Append(
- base::WrapUnique(node_details = new base::DictionaryValue()));
+ cert_sub_fields->Append(base::MakeUnique<base::DictionaryValue>());
+ cert_sub_fields->GetDictionary(cert_sub_fields->GetSize() - 1, &node_details);
node_details->SetString("label",
l10n_util::GetStringUTF8(IDS_CERT_INFO_SHA256_FINGERPRINT_LABEL));
node_details->SetString("payload.val",
x509_certificate_model::HashCertSHA256(cert));
- cert_sub_fields->Append(
- base::WrapUnique(node_details = new base::DictionaryValue()));
+ cert_sub_fields->Append(base::MakeUnique<base::DictionaryValue>());
+ cert_sub_fields->GetDictionary(cert_sub_fields->GetSize() - 1, &node_details);
node_details->SetString("label",
l10n_util::GetStringUTF8(IDS_CERT_INFO_SHA1_FINGERPRINT_LABEL));
node_details->SetString("payload.val",
« chrome/browser/extensions/menu_manager.cc ('K') | « chrome/browser/ui/webui/browsing_history_handler.cc ('k') | chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc » ('j') | chromecast/crash/linux/crash_testing_utils.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698