Certificate Transparency: Change CTVerifyResult to have a single list

chrome/browser/ssl/chrome_expect_ct_reporter_unittest.cc

 // Copyright 2016 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 "chrome/browser/ssl/chrome_expect_ct_reporter.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/command_line.h"
@@ skipping 174 matching lines @@
 // from an Expect CT report.
 void CheckReportSCTs(
     const net::SignedCertificateTimestampAndStatusList& expected_scts,
     const base::ListValue& unknown_scts,
     const base::ListValue& invalid_scts,
     const base::ListValue& valid_scts) {
   EXPECT_EQ(
       expected_scts.size(),
       unknown_scts.GetSize() + invalid_scts.GetSize() + valid_scts.GetSize());
   for (const auto& expected_sct : expected_scts) {
+    std::unique_ptr<base::ListValue> sct_list;

[estark, 2016/08/09 02:43:22]

Hrmm, not sure I understand this change, could you explain?

[Eran Messeri, 2016/08/09 08:14:21]

The goal was to save repeated calls to:

    ASSERT_NO_FATAL_FAILURE(FindSCTInReportList(
        expected_sct.sct, expected_sct.status, *(sct_list.get())));

But this change is not, strictly speaking, necessary, so I've reverted it.

     switch (expected_sct.status) {
       case net::ct::SCT_STATUS_LOG_UNKNOWN:
-        ASSERT_NO_FATAL_FAILURE(FindSCTInReportList(
-            expected_sct.sct, net::ct::SCT_STATUS_LOG_UNKNOWN, unknown_scts));
+        sct_list.reset(unknown_scts.DeepCopy());
         break;
       case net::ct::SCT_STATUS_INVALID:
-        ASSERT_NO_FATAL_FAILURE(FindSCTInReportList(
-            expected_sct.sct, net::ct::SCT_STATUS_INVALID, invalid_scts));
+        sct_list.reset(invalid_scts.DeepCopy());
         break;
       case net::ct::SCT_STATUS_OK:
-        ASSERT_NO_FATAL_FAILURE(FindSCTInReportList(
-            expected_sct.sct, net::ct::SCT_STATUS_OK, valid_scts));
+        sct_list.reset(valid_scts.DeepCopy());
         break;
       default:
         NOTREACHED();
     }
+
+    ASSERT_NO_FATAL_FAILURE(FindSCTInReportList(
+        expected_sct.sct, expected_sct.status, *(sct_list.get())));
   }
 }
 
 // Checks that the |serialized_report| deserializes properly and
 // contains the correct information (hostname, port, served and
 // validated certificate chains, SCTs) for the given |host_port| and
 // |ssl_info|.
 void CheckExpectCTReport(const std::string& serialized_report,
                          const net::HostPortPair& host_port,
                          const net::SSLInfo& ssl_info) {
@@ skipping 242 matching lines @@
   reporter.OnExpectCTFailed(host_port, report_uri, ssl_info);
   EXPECT_EQ(report_uri, sender->latest_report_uri());
   EXPECT_FALSE(sender->latest_serialized_report().empty());
   ASSERT_NO_FATAL_FAILURE(CheckExpectCTReport(
       sender->latest_serialized_report(), host_port, ssl_info));
 
   histograms.ExpectTotalCount(kFailureHistogramName, 0);
   histograms.ExpectTotalCount(kSendHistogramName, 1);
   histograms.ExpectBucketCount(kSendHistogramName, true, 1);
 }