Certificate Transparency: Change CTVerifyResult to have a single list

net/cert/multi_log_ct_verifier_unittest.cc

Index: net/cert/multi_log_ct_verifier_unittest.cc
diff --git a/net/cert/multi_log_ct_verifier_unittest.cc b/net/cert/multi_log_ct_verifier_unittest.cc
index 613218c0661baf0ad302b3f7ad2ad95048ef3069..40617ad7611fe1138764106eb0535248c7285875 100644
--- a/net/cert/multi_log_ct_verifier_unittest.cc
+++ b/net/cert/multi_log_ct_verifier_unittest.cc
@@ -85,14 +85,13 @@ class MultiLogCTVerifierTest : public ::testing::Test {
       return false;
 
     const TestNetLogEntry& parsed = entries[1];
-    base::ListValue* verified_scts;
-    if (!parsed.GetListValue("verified_scts", &verified_scts) ||
-        verified_scts->GetSize() != 1) {
+    base::ListValue* scts;
+    if (!parsed.GetListValue("scts", &scts) || scts->GetSize() != 1) {
       return false;
     }
 
     base::DictionaryValue* the_sct;
-    if (!verified_scts->GetDictionary(0, &the_sct))
+    if (!scts->GetDictionary(0, &the_sct))
       return false;
 
     std::string origin;
@@ -101,16 +100,11 @@ class MultiLogCTVerifierTest : public ::testing::Test {
     if (origin != "Embedded in certificate")
       return false;
 
-    base::ListValue* other_scts;
-    if (!parsed.GetListValue("invalid_scts", &other_scts) ||
-        !other_scts->empty()) {
+    std::string verification_status;
+    if (!the_sct->GetString("verification_status", &verification_status))
       return false;
-    }
-
-    if (!parsed.GetListValue("unknown_logs_scts", &other_scts) ||
-        !other_scts->empty()) {
+    if (verification_status != "Verified")
       return false;
-    }
 
     return true;
   }
@@ -236,8 +230,9 @@ TEST_F(MultiLogCTVerifierTest, IdentifiesSCTFromUnknownLog) {
   EXPECT_NE(OK,
             verifier_->Verify(
                 chain_.get(), std::string(), sct_list, &result, BoundNetLog()));
-  EXPECT_EQ(1U, result.unknown_logs_scts.size());
-  EXPECT_EQ("", result.unknown_logs_scts[0]->log_description);
+  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);
 }
 
 TEST_F(MultiLogCTVerifierTest, CountsValidSCTsInStatusHistogram) {