| 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,
|
|
|