Cleanup: More accurate output parameter type for CTVerifier

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 <memory>
 #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/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/signed_certificate_timestamp_and_status.h"
 #include "net/cert/x509_certificate.h"
 #include "net/log/net_log_source_type.h"
 #include "net/log/net_log_with_source.h"
 #include "net/log/test_net_log.h"
 #include "net/log/test_net_log_entry.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/ct_test_util.h"
 #include "net/test/test_data_directory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 71 matching lines @@
 
     std::string verification_status;
     if (!the_sct->GetString("verification_status", &verification_status))
       return false;
     if (verification_status != "Verified")
       return false;
 
     return true;
   }
 
-  bool VerifySinglePrecertificateChain(scoped_refptr<X509Certificate> chain,
-                                       const NetLogWithSource& net_log,
-                                       ct::CTVerifyResult* result) {
-    return verifier_->Verify(chain.get(), std::string(), std::string(), result,
-                             net_log) == OK;
+  bool VerifySinglePrecertificateChain(
+      scoped_refptr<X509Certificate> chain,
+      const NetLogWithSource& net_log,
+      SignedCertificateTimestampAndStatusList* output_scts) {
+    return verifier_->Verify(chain.get(), std::string(), std::string(),
+                             output_scts, net_log) == OK;
   }
 
   bool VerifySinglePrecertificateChain(scoped_refptr<X509Certificate> chain) {
-    ct::CTVerifyResult result;
+    SignedCertificateTimestampAndStatusList scts;
     TestNetLog test_net_log;
     NetLogWithSource net_log =
         NetLogWithSource::Make(&test_net_log, NetLogSourceType::CONNECT_JOB);
 
-    return verifier_->Verify(chain.get(), std::string(), std::string(), &result,
+    return verifier_->Verify(chain.get(), std::string(), std::string(), &scts,
                              net_log) == OK;
   }
 
   bool CheckPrecertificateVerification(scoped_refptr<X509Certificate> chain) {
-    ct::CTVerifyResult result;
+    SignedCertificateTimestampAndStatusList scts;
     TestNetLog test_net_log;
     NetLogWithSource net_log =
         NetLogWithSource::Make(&test_net_log, NetLogSourceType::CONNECT_JOB);
-    return (VerifySinglePrecertificateChain(chain, net_log, &result) &&
-            ct::CheckForSingleVerifiedSCTInResult(result, kLogDescription) &&
+    return (VerifySinglePrecertificateChain(chain, net_log, &scts) &&
+            ct::CheckForSingleVerifiedSCTInResult(scts, kLogDescription) &&
             ct::CheckForSCTOrigin(
-                result, ct::SignedCertificateTimestamp::SCT_EMBEDDED) &&
+                scts, ct::SignedCertificateTimestamp::SCT_EMBEDDED) &&
             CheckForEmbeddedSCTInNetLog(test_net_log));
   }
 
   // Histogram-related helper methods
   int GetValueFromHistogram(const std::string& histogram_name,
                             int sample_index) {
     base::Histogram* histogram = static_cast<base::Histogram*>(
         base::StatisticsRecorder::FindHistogram(histogram_name));
 
     if (histogram == NULL)
@@ skipping 53 matching lines @@
       GetTestCertsDirectory(),
       "ct-test-embedded-with-intermediate-preca-chain.pem",
       X509Certificate::FORMAT_AUTO));
   ASSERT_TRUE(chain.get());
   ASSERT_TRUE(CheckPrecertificateVerification(chain));
 }
 
 TEST_F(MultiLogCTVerifierTest, VerifiesSCTOverX509Cert) {
   std::string sct_list = ct::GetSCTListForTesting();
 
-  ct::CTVerifyResult result;
-  EXPECT_EQ(OK, verifier_->Verify(chain_.get(), std::string(), sct_list,
-                                  &result, NetLogWithSource()));
-  ASSERT_TRUE(ct::CheckForSingleVerifiedSCTInResult(result, kLogDescription));
+  SignedCertificateTimestampAndStatusList scts;
+  EXPECT_EQ(OK, verifier_->Verify(chain_.get(), std::string(), sct_list, &scts,
+                                  NetLogWithSource()));
+  ASSERT_TRUE(ct::CheckForSingleVerifiedSCTInResult(scts, kLogDescription));
   ASSERT_TRUE(ct::CheckForSCTOrigin(
-      result, ct::SignedCertificateTimestamp::SCT_FROM_TLS_EXTENSION));
+      scts, ct::SignedCertificateTimestamp::SCT_FROM_TLS_EXTENSION));
 }
 
 TEST_F(MultiLogCTVerifierTest, IdentifiesSCTFromUnknownLog) {
   std::string sct_list = ct::GetSCTListWithInvalidSCT();
-  ct::CTVerifyResult result;
+  SignedCertificateTimestampAndStatusList scts;
 
-  EXPECT_NE(OK, verifier_->Verify(chain_.get(), std::string(), sct_list,
-                                  &result, NetLogWithSource()));
-  EXPECT_EQ(1U, result.scts.size());
-  EXPECT_EQ("", result.scts[0].sct->log_description);
-  EXPECT_EQ(ct::SCT_STATUS_LOG_UNKNOWN, result.scts[0].status);
+  EXPECT_NE(OK, verifier_->Verify(chain_.get(), std::string(), sct_list, &scts,
+                                  NetLogWithSource()));
+  EXPECT_EQ(1U, scts.size());
+  EXPECT_EQ("", scts[0].sct->log_description);
+  EXPECT_EQ(ct::SCT_STATUS_LOG_UNKNOWN, scts[0].status);
 }
 
 TEST_F(MultiLogCTVerifierTest, CountsValidSCTsInStatusHistogram) {
   int num_valid_scts = NumValidSCTsInStatusHistogram();
 
   ASSERT_TRUE(VerifySinglePrecertificateChain(embedded_sct_chain_));
 
   EXPECT_EQ(num_valid_scts + 1, NumValidSCTsInStatusHistogram());
 }
 
 TEST_F(MultiLogCTVerifierTest, CountsInvalidSCTsInStatusHistogram) {
   std::string sct_list = ct::GetSCTListWithInvalidSCT();
-  ct::CTVerifyResult result;
+  SignedCertificateTimestampAndStatusList scts;
+
   int num_valid_scts = NumValidSCTsInStatusHistogram();
   int num_invalid_scts = GetValueFromHistogram(
       "Net.CertificateTransparency.SCTStatus", ct::SCT_STATUS_LOG_UNKNOWN);
 
-  EXPECT_NE(OK, verifier_->Verify(chain_.get(), std::string(), sct_list,
-                                  &result, NetLogWithSource()));
+  EXPECT_NE(OK, verifier_->Verify(chain_.get(), std::string(), sct_list, &scts,
+                                  NetLogWithSource()));
 
   ASSERT_EQ(num_valid_scts, NumValidSCTsInStatusHistogram());
   ASSERT_EQ(num_invalid_scts + 1,
             GetValueFromHistogram("Net.CertificateTransparency.SCTStatus",
                                   ct::SCT_STATUS_LOG_UNKNOWN));
 }
 
 TEST_F(MultiLogCTVerifierTest, CountsSingleEmbeddedSCTInConnectionsHistogram) {
   int old_sct_count = NumConnectionsWithSingleSCT();
   ASSERT_TRUE(CheckPrecertificateVerification(embedded_sct_chain_));
@@ skipping 30 matching lines @@
   Mock::VerifyAndClearExpectations(&observer);
 
   EXPECT_CALL(observer, OnSCTVerified(embedded_sct_chain_.get(), _)).Times(0);
   verifier_->SetObserver(nullptr);
   ASSERT_TRUE(VerifySinglePrecertificateChain(embedded_sct_chain_));
 }
 
 }  // namespace
 
 }  // namespace net