Consistent SignedCertificateTimestamp::Version and SignedTreeHead::Version

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>
 
@@ skipping 186 matching lines @@
 }
 
 std::string GetTestPublicKeyId() {
   return HexToBytes(kTestKeyId);
 }
 
 void GetX509CertSCT(scoped_refptr<SignedCertificateTimestamp>* sct_ref) {
   CHECK(sct_ref != NULL);
   *sct_ref = new SignedCertificateTimestamp();
   SignedCertificateTimestamp *const sct(sct_ref->get());
-  sct->version = ct::SignedCertificateTimestamp::SCT_VERSION_1;
+  sct->version = ct::SignedCertificateTimestamp::V1;
   sct->log_id = HexToBytes(kTestKeyId);
   // Time the log issued a SCT for this certificate, which is
   // Fri Apr  5 10:04:16.089 2013
   sct->timestamp = base::Time::UnixEpoch() +
       base::TimeDelta::FromMilliseconds(INT64_C(1365181456089));
   sct->extensions.clear();
 
   sct->signature.hash_algorithm = ct::DigitallySigned::HASH_ALGO_SHA256;
   sct->signature.signature_algorithm = ct::DigitallySigned::SIG_ALGO_ECDSA;
   sct->signature.signature_data = HexToBytes(kTestSCTSignatureData);
 }
 
 void GetPrecertSCT(scoped_refptr<SignedCertificateTimestamp>* sct_ref) {
   CHECK(sct_ref != NULL);
   *sct_ref = new SignedCertificateTimestamp();
   SignedCertificateTimestamp *const sct(sct_ref->get());
-  sct->version = ct::SignedCertificateTimestamp::SCT_VERSION_1;
+  sct->version = ct::SignedCertificateTimestamp::V1;
   sct->log_id = HexToBytes(kTestKeyId);
   // Time the log issued a SCT for this Precertificate, which is
   // Fri Apr  5 10:04:16.275 2013
   sct->timestamp = base::Time::UnixEpoch() +
     base::TimeDelta::FromMilliseconds(INT64_C(1365181456275));
   sct->extensions.clear();
 
   sct->signature.hash_algorithm = ct::DigitallySigned::HASH_ALGO_SHA256;
   sct->signature.signature_algorithm = ct::DigitallySigned::SIG_ALGO_ECDSA;
   sct->signature.signature_data = HexToBytes(kTestSCTPrecertSignatureData);
@@ skipping 153 matching lines @@
 
 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