Updated NetLog::ParametersCallback & all related calbacks returning value as scoped_ptr<base::Value…

net/cert/cert_policy_enforcer.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/cert/cert_policy_enforcer.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/build_time.h"
@@ skipping 167 matching lines @@
   // Whether the build is not older than 10 weeks. The value is meaningful only
   // if |ct_presence_required| is true.
   bool build_timely;
   // Compliance status - meaningful only if |ct_presence_required| and
   // |build_timely| are true.
   CTComplianceStatus status;
   // EV whitelist version.
   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);
   if (details->ct_presence_required) {
     dict->SetBoolean("build_timely", details->build_timely);
     if (details->build_timely) {
       dict->SetString("ct_compliance_status",
                       ComplianceStatusToString(details->status));
       if (details->whitelist_version.IsValid())
         dict->SetString("ev_whitelist_version",
                         details->whitelist_version.GetString());
     }
   }
-  return dict;
+  return dict.Pass();
 }
 
 bool IsCertificateInWhitelist(const X509Certificate& cert,
                               const ct::EVCertsWhitelist* ev_whitelist) {
   bool cert_in_ev_whitelist = false;
   if (ev_whitelist && ev_whitelist->IsValid()) {
     const SHA256HashValue fingerprint(
         X509Certificate::CalculateFingerprint256(cert.os_cert_handle()));
 
     std::string truncated_fp =
@@ skipping 37 matching lines @@
 bool CertPolicyEnforcer::DoesConformToCTEVPolicy(
     X509Certificate* cert,
     const ct::EVCertsWhitelist* ev_whitelist,
     const ct::CTVerifyResult& ct_result,
     const BoundNetLog& net_log) {
   ComplianceDetails details;
 
   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,
                    net_log_callback);
 
   if (!details.ct_presence_required)
     return true;
 
   if (!details.build_timely)
     return false;
 
   LogCTComplianceStatusToUMA(details.status, ev_whitelist);
 
   if (details.status == CT_IN_WHITELIST || details.status == CT_ENOUGH_SCTS)
     return true;
 
   return false;
 }
 
 }  // namespace net