Rename NetLogLogger and CapturingNetLog

net/cert/multi_log_ct_verifier_unittest.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 <string>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/values.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_data_directory.h"
 #include "net/cert/ct_log_verifier.h"
 #include "net/cert/ct_serialization.h"
 #include "net/cert/ct_verify_result.h"
 #include "net/cert/pem_tokenizer.h"
 #include "net/cert/sct_status_flags.h"
 #include "net/cert/signed_certificate_timestamp.h"
 #include "net/cert/x509_certificate.h"
-#include "net/log/capturing_net_log.h"
 #include "net/log/net_log.h"
+#include "net/log/test_net_log.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/ct_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
 const char kLogDescription[] = "somelog";
 const char kSCTCountHistogram[] =
@@ skipping 28 matching lines @@
         result.verified_scts[0]->log_description == kLogDescription;
   }
 
   bool CheckForSCTOrigin(
       const ct::CTVerifyResult& result,
       ct::SignedCertificateTimestamp::Origin origin) {
     return (result.verified_scts.size() > 0) &&
         (result.verified_scts[0]->origin == origin);
   }
 
-  bool CheckForEmbeddedSCTInNetLog(CapturingNetLog& net_log) {
-    CapturingNetLog::CapturedEntryList entries;
+  bool CheckForEmbeddedSCTInNetLog(TestNetLog& net_log) {
+    TestNetLog::CapturedEntryList entries;
     net_log.GetEntries(&entries);
     if (entries.size() != 2)
       return false;
 
-    const CapturingNetLog::CapturedEntry& received = entries[0];
+    const TestNetLog::CapturedEntry& received = entries[0];
     std::string embedded_scts;
     if (!received.GetStringValue("embedded_scts", &embedded_scts))
       return false;
     if (embedded_scts.empty())
       return false;
 
-    const CapturingNetLog::CapturedEntry& parsed = entries[1];
+    const TestNetLog::CapturedEntry& parsed = entries[1];
     base::ListValue* verified_scts;
     if (!parsed.GetListValue("verified_scts", &verified_scts) ||
         verified_scts->GetSize() != 1) {
       return false;
     }
 
     base::DictionaryValue* the_sct;
     if (!verified_scts->GetDictionary(0, &the_sct))
       return false;
 
@@ skipping 34 matching lines @@
                                        ct::CTVerifyResult* result) {
     return verifier_->Verify(chain.get(),
                              std::string(),
                              std::string(),
                              result,
                              bound_net_log) == OK;
   }
 
   bool VerifySinglePrecertificateChain(scoped_refptr<X509Certificate> chain) {
     ct::CTVerifyResult result;
-    CapturingNetLog net_log;
+    TestNetLog net_log;
     BoundNetLog bound_net_log =
         BoundNetLog::Make(&net_log, NetLog::SOURCE_CONNECT_JOB);
 
     return verifier_->Verify(chain.get(),
                              std::string(),
                              std::string(),
                              &result,
                              bound_net_log) == OK;
   }
 
   bool CheckPrecertificateVerification(scoped_refptr<X509Certificate> chain) {
     ct::CTVerifyResult result;
-    CapturingNetLog net_log;
+    TestNetLog net_log;
     BoundNetLog bound_net_log =
       BoundNetLog::Make(&net_log, NetLog::SOURCE_CONNECT_JOB);
     return (VerifySinglePrecertificateChain(chain, bound_net_log, &result) &&
             CheckForSingleVerifiedSCTInResult(result) &&
             CheckForSCTOrigin(result,
                               ct::SignedCertificateTimestamp::SCT_EMBEDDED) &&
             CheckForEmbeddedSCTInNetLog(net_log));
   }
 
   // Histogram-related helper methods
@@ skipping 128 matching lines @@
 TEST_F(MultiLogCTVerifierTest, CountsZeroSCTsCorrectly) {
   int connections_without_scts = GetValueFromHistogram(kSCTCountHistogram, 0);
   EXPECT_FALSE(VerifySinglePrecertificateChain(chain_));
   ASSERT_EQ(connections_without_scts + 1,
             GetValueFromHistogram(kSCTCountHistogram, 0));
 }
 
 }  // namespace
 
 }  // namespace net