Extracting NetLog inner classes into their own classes.

net/cert/multi_log_ct_verifier.cc

 // Copyright 2013 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/multi_log_ct_verifier.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/values.h"
 #include "net/base/net_errors.h"
 #include "net/cert/ct_log_verifier.h"
 #include "net/cert/ct_objects_extractor.h"
 #include "net/cert/ct_serialization.h"
 #include "net/cert/ct_signed_certificate_timestamp_log_param.h"
 #include "net/cert/ct_verify_result.h"
 #include "net/cert/sct_status_flags.h"
 #include "net/cert/x509_certificate.h"
-#include "net/log/net_log.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 {
 
 // Record SCT verification status. This metric would help detecting presence
 // of unknown CT logs as well as bad deployments (invalid SCTs).
 void LogSCTStatusToUMA(ct::SCTVerifyStatus status) {
   // Note SCT_STATUS_MAX + 1 is passed to the UMA_HISTOGRAM_ENUMERATION as that
   // macro requires the values to be strictly less than the boundary value,
@@ skipping 77 matching lines @@
   std::string sct_list_from_ocsp;
   if (!stapled_ocsp_response.empty() &&
       !cert->GetIntermediateCertificates().empty()) {
     ct::ExtractSCTListFromOCSPResponse(
         cert->GetIntermediateCertificates().front(), cert->serial_number(),
         stapled_ocsp_response, &sct_list_from_ocsp);
   }
 
   // Log to Net Log, after extracting SCTs but before possibly failing on
   // X.509 entry creation.
-  NetLog::ParametersCallback net_log_callback =
-      base::Bind(&NetLogRawSignedCertificateTimestampCallback,
-          &embedded_scts, &sct_list_from_ocsp, &sct_list_from_tls_extension);
+  NetLogParametersCallback net_log_callback =
+      base::Bind(&NetLogRawSignedCertificateTimestampCallback, &embedded_scts,
+                 &sct_list_from_ocsp, &sct_list_from_tls_extension);
 
   net_log.AddEvent(NetLogEventType::SIGNED_CERTIFICATE_TIMESTAMPS_RECEIVED,
                    net_log_callback);
 
   ct::LogEntry x509_entry;
   if (ct::GetX509LogEntry(cert->os_cert_handle(), &x509_entry)) {
     has_verified_scts |= VerifySCTs(
         sct_list_from_ocsp, x509_entry,
         ct::SignedCertificateTimestamp::SCT_FROM_OCSP_RESPONSE, cert, result);
 
     has_verified_scts |= VerifySCTs(
         sct_list_from_tls_extension, x509_entry,
         ct::SignedCertificateTimestamp::SCT_FROM_TLS_EXTENSION, cert, result);
   }
 
-  NetLog::ParametersCallback net_log_checked_callback =
+  NetLogParametersCallback net_log_checked_callback =
       base::Bind(&NetLogSignedCertificateTimestampCallback, result);
 
   net_log.AddEvent(NetLogEventType::SIGNED_CERTIFICATE_TIMESTAMPS_CHECKED,
                    net_log_checked_callback);
 
   LogNumSCTsToUMA(*result);
 
   if (has_verified_scts)
     return OK;
 
@@ skipping 63 matching lines @@
     return false;
   }
 
   AddSCTAndLogStatus(sct, ct::SCT_STATUS_OK, &(result->scts));
   if (observer_)
     observer_->OnSCTVerified(cert, sct.get());
   return true;
 }
 
 } // namespace net