Revert "Revert of CT Verify test utilities change - Moved the following common functions (patchset …

net/test/ct_test_util.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/test/ct_test_util.h"
 
 #include <stdint.h>
 #include <string.h>
 #include <vector>
 
 #include "base/base64.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "net/cert/ct_serialization.h"
-#include "net/cert/signed_certificate_timestamp.h"
+#include "net/cert/ct_verify_result.h"
 #include "net/cert/signed_tree_head.h"
 #include "net/cert/x509_certificate.h"
 
 namespace net {
 
 namespace ct {
 
 namespace {
 
 std::string HexToBytes(const char* hex_data) {
@@ skipping 325 matching lines @@
     consistency_proof_json +=
         base::StringPrintf("\"%s\"", proof_node_b64.c_str());
     if (it + 1 != raw_nodes.end())
       consistency_proof_json += std::string(",");
   }
   consistency_proof_json += std::string("]}");
 
   return consistency_proof_json;
 }
 
+std::string GetSCTListForTesting() {
+  const std::string sct = ct::GetTestSignedCertificateTimestamp();
+  std::string sct_list;
+  ct::EncodeSCTListForTesting(sct, &sct_list);
+  return sct_list;
+}
+
+std::string GetSCTListWithInvalidSCT() {
+  std::string sct(ct::GetTestSignedCertificateTimestamp());
+
+  // Change a byte inside the Log ID part of the SCT so it does not match the
+  // log used in the tests.
+  sct[15] = 't';
+
+  std::string sct_list;
+  ct::EncodeSCTListForTesting(sct, &sct_list);
+  return sct_list;
+}
+
+bool CheckForSingleVerifiedSCTInResult(const ct::CTVerifyResult& result,
+                                       const std::string& log_description) {
+  return (result.verified_scts.size() == 1U) && result.invalid_scts.empty() &&
+         result.unknown_logs_scts.empty() &&
+         result.verified_scts[0]->log_description == log_description;
+}
+
+bool CheckForSCTOrigin(const ct::CTVerifyResult& result,
+                       ct::SignedCertificateTimestamp::Origin origin) {
+  return (result.verified_scts.size() > 0) &&
+         (result.verified_scts[0]->origin == origin);
+}
+
 }  // namespace ct
 
 }  // namespace net