Extracting NetLog inner classes into their own classes.

net/cert/ct_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/ct_policy_enforcer.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/build_time.h"
 #include "base/callback_helpers.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "net/cert/ct_ev_whitelist.h"
 #include "net/cert/ct_known_logs.h"
 #include "net/cert/ct_policy_status.h"
 #include "net/cert/ct_verify_result.h"
 #include "net/cert/signed_certificate_timestamp.h"
 #include "net/cert/x509_certificate.h"
 #include "net/cert/x509_certificate_net_log_param.h"
-#include "net/log/net_log.h"
+#include "net/log/net_log_capture_mode.h"
 #include "net/log/net_log_event_type.h"
+#include "net/log/net_log_parameters_callback.h"
+#include "net/log/net_log_with_source.h"
 
 namespace net {
 
 namespace {
 
 // Returns true if the current build is recent enough to ensure that
 // built-in security information (e.g. CT Logs) is fresh enough.
 // TODO(eranm): Move to base or net/base
 bool IsBuildTimely() {
   const base::Time build_time = base::GetBuildTime();
@@ skipping 364 matching lines @@
   // needs up-to-date information about logs to consider certificates to
   // be compliant with policy.
   bool build_timely = IsBuildTimely();
   ct::CertPolicyCompliance compliance;
   if (!build_timely) {
     compliance = ct::CertPolicyCompliance::CERT_POLICY_BUILD_NOT_TIMELY;
   } else {
     compliance = CheckCertPolicyCompliance(*cert, verified_scts);
   }
 
-  NetLog::ParametersCallback net_log_callback =
+  NetLogParametersCallback net_log_callback =
       base::Bind(&NetLogCertComplianceCheckResultCallback,
                  base::Unretained(cert), build_timely, compliance);
 
   net_log.AddEvent(NetLogEventType::CERT_CT_COMPLIANCE_CHECKED,
                    net_log_callback);
 
   return compliance;
 }
 
 ct::EVPolicyCompliance CTPolicyEnforcer::DoesConformToCTEVPolicy(
     X509Certificate* cert,
     const ct::EVCertsWhitelist* ev_whitelist,
     const ct::SCTList& verified_scts,
     const NetLogWithSource& net_log) {
   EVComplianceDetails details;
   // If the build is not timely, no certificate is considered compliant
   // with EV policy. The reasoning is that, for example, a log might
   // have been pulled and is no longer considered valid; thus, a client
   // needs up-to-date information about logs to consider certificates to
   // be compliant with policy.
   details.build_timely = IsBuildTimely();
   if (!details.build_timely) {
     details.status = ct::EVPolicyCompliance::EV_POLICY_BUILD_NOT_TIMELY;
   } else {
     CheckCTEVPolicyCompliance(cert, ev_whitelist, verified_scts, net_log,
                               &details);
   }
 
-  NetLog::ParametersCallback net_log_callback =
+  NetLogParametersCallback net_log_callback =
       base::Bind(&NetLogEVComplianceCheckResultCallback, base::Unretained(cert),
                  base::Unretained(&details));
 
   net_log.AddEvent(NetLogEventType::EV_CERT_CT_COMPLIANCE_CHECKED,
                    net_log_callback);
 
   if (!details.build_timely)
     return ct::EVPolicyCompliance::EV_POLICY_BUILD_NOT_TIMELY;
 
   LogEVPolicyComplianceToUMA(details.status, ev_whitelist);
 
   return details.status;
 }
 
 }  // namespace net