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

Unified Diff: net/cert/cert_policy_enforcer.cc

Issue 1135373002: Updated NetLog::ParametersCallback & all related calbacks returning value as scoped_ptr<base::Value… Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « net/base/sdch_net_log_params.cc ('k') | net/cert/ct_signed_certificate_timestamp_log_param.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/cert/cert_policy_enforcer.cc
diff --git a/net/cert/cert_policy_enforcer.cc b/net/cert/cert_policy_enforcer.cc
index 74c195d3e36a1b13dba6a680c36540d6815995d2..605e141c3c422039e4413688244f3493356f9625 100644
--- a/net/cert/cert_policy_enforcer.cc
+++ b/net/cert/cert_policy_enforcer.cc
@@ -185,11 +185,11 @@ struct ComplianceDetails {
base::Version whitelist_version;
};
-base::Value* NetLogComplianceCheckResultCallback(
+scoped_ptr<base::Value> NetLogComplianceCheckResultCallback(
X509Certificate* cert,
ComplianceDetails* details,
NetLogCaptureMode capture_mode) {
- base::DictionaryValue* dict = new base::DictionaryValue();
+ scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
dict->Set("certificate", NetLogX509CertificateCallback(cert, capture_mode));
dict->SetBoolean("policy_enforcement_required",
details->ct_presence_required);
@@ -203,7 +203,7 @@ base::Value* NetLogComplianceCheckResultCallback(
details->whitelist_version.GetString());
}
}
- return dict;
+ return dict.Pass();
}
bool IsCertificateInWhitelist(const X509Certificate& cert,
@@ -261,7 +261,7 @@ bool CertPolicyEnforcer::DoesConformToCTEVPolicy(
CheckCTEVPolicyCompliance(cert, ev_whitelist, ct_result, &details);
NetLog::ParametersCallback net_log_callback =
- base::Bind(&NetLogComplianceCheckResultCallback, base::Unretained(cert),
+ base::Bind(NetLogComplianceCheckResultCallback, base::Unretained(cert),
base::Unretained(&details));
net_log.AddEvent(NetLog::TYPE_EV_CERT_CT_COMPLIANCE_CHECKED,
« no previous file with comments | « net/base/sdch_net_log_params.cc ('k') | net/cert/ct_signed_certificate_timestamp_log_param.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698