Refactor how net/data/verify_certificate_chain_unittest/*

net/cert/internal/verify_certificate_chain_typed_unittest.h

Index: net/cert/internal/verify_certificate_chain_typed_unittest.h
diff --git a/net/cert/internal/verify_certificate_chain_typed_unittest.h b/net/cert/internal/verify_certificate_chain_typed_unittest.h
index 148aad4fe8dfab1d5f05b015095c363fc40bb5db..299b7bd329b01477a214708d6c052a319ec61655 100644
--- a/net/cert/internal/verify_certificate_chain_typed_unittest.h
+++ b/net/cert/internal/verify_certificate_chain_typed_unittest.h
@@ -26,7 +26,10 @@ class VerifyCertificateChainTest : public ::testing::Test {
 
     SCOPED_TRACE("Test file: " + path);
 
-    ReadVerifyCertChainTestFromFile(path, &test);
+    if (!ReadVerifyCertChainTestFromFile(path, &test)) {
+      ADD_FAILURE() << "Couldn't load test case: " << path;
+      return;
+    }
 
     TestDelegate::Verify(test, path);
   }
@@ -41,106 +44,106 @@ class VerifyCertificateChainSingleRootTest
 TYPED_TEST_CASE_P(VerifyCertificateChainSingleRootTest);
 
 TYPED_TEST_P(VerifyCertificateChainSingleRootTest, Simple) {
-  this->RunTest("target-and-intermediate.pem");
+  this->RunTest("target-and-intermediate/main.test");
 }
 
 TYPED_TEST_P(VerifyCertificateChainSingleRootTest, BasicConstraintsCa) {
-  this->RunTest("intermediate-lacks-basic-constraints.pem");
-  this->RunTest("intermediate-basic-constraints-ca-false.pem");
-  this->RunTest("intermediate-basic-constraints-not-critical.pem");
-  this->RunTest("unconstrained-root-lacks-basic-constraints.pem");
-  this->RunTest("constrained-root-lacks-basic-constraints.pem");
-  this->RunTest("unconstrained-root-basic-constraints-ca-false.pem");
-  this->RunTest("constrained-root-basic-constraints-ca-false.pem");
+  this->RunTest("intermediate-lacks-basic-constraints/main.test");
+  this->RunTest("intermediate-basic-constraints-ca-false/main.test");
+  this->RunTest("intermediate-basic-constraints-not-critical/main.test");
+  this->RunTest("unconstrained-root-lacks-basic-constraints/main.test");
+  this->RunTest("constrained-root-lacks-basic-constraints/main.test");
+  this->RunTest("unconstrained-root-basic-constraints-ca-false/main.test");
+  this->RunTest("constrained-root-basic-constraints-ca-false/main.test");
 }
 
 TYPED_TEST_P(VerifyCertificateChainSingleRootTest, BasicConstraintsPathlen) {
-  this->RunTest("violates-basic-constraints-pathlen-0.pem");
-  this->RunTest("basic-constraints-pathlen-0-self-issued.pem");
-  this->RunTest("target-has-pathlen-but-not-ca.pem");
-  this->RunTest("violates-pathlen-1-constrained-root.pem");
-  this->RunTest("violates-pathlen-1-unconstrained-root.pem");
+  this->RunTest("violates-basic-constraints-pathlen-0/main.test");
+  this->RunTest("basic-constraints-pathlen-0-self-issued/main.test");
+  this->RunTest("target-has-pathlen-but-not-ca/main.test");
+  this->RunTest("violates-pathlen-1-constrained-root/main.test");
+  this->RunTest("violates-pathlen-1-unconstrained-root/main.test");
 }
 
 TYPED_TEST_P(VerifyCertificateChainSingleRootTest, UnknownExtension) {
-  this->RunTest("intermediate-unknown-critical-extension.pem");
-  this->RunTest("intermediate-unknown-non-critical-extension.pem");
-  this->RunTest("target-unknown-critical-extension.pem");
+  this->RunTest("intermediate-unknown-critical-extension/main.test");
+  this->RunTest("intermediate-unknown-non-critical-extension/main.test");
+  this->RunTest("target-unknown-critical-extension/main.test");
 }
 
 TYPED_TEST_P(VerifyCertificateChainSingleRootTest, Md5) {
-  this->RunTest("target-signed-with-md5.pem");
-  this->RunTest("intermediate-signed-with-md5.pem");
+  this->RunTest("target-signed-with-md5/main.test");
+  this->RunTest("intermediate-signed-with-md5/main.test");
 }
 
 TYPED_TEST_P(VerifyCertificateChainSingleRootTest, WrongSignature) {
-  this->RunTest("target-wrong-signature.pem");
-  this->RunTest("incorrect-trust-anchor.pem");
+  this->RunTest("target-wrong-signature/main.test");
+  this->RunTest("incorrect-trust-anchor/main.test");
 }
 
 TYPED_TEST_P(VerifyCertificateChainSingleRootTest, TargetSignedBy512bitRsa) {
-  this->RunTest("target-signed-by-512bit-rsa.pem");
+  this->RunTest("target-signed-by-512bit-rsa/main.test");
 }
 
 TYPED_TEST_P(VerifyCertificateChainSingleRootTest, TargetSignedUsingEcdsa) {
-  this->RunTest("target-signed-using-ecdsa.pem");
+  this->RunTest("target-signed-using-ecdsa/main.test");
 }
 
 TYPED_TEST_P(VerifyCertificateChainSingleRootTest, Expired) {
-  this->RunTest("expired-target.pem");
-  this->RunTest("expired-intermediate.pem");
-  this->RunTest("expired-target-notBefore.pem");
-  this->RunTest("expired-unconstrained-root.pem");
-  this->RunTest("expired-constrained-root.pem");
+  this->RunTest("expired-target/main.test");
+  this->RunTest("expired-intermediate/main.test");
+  this->RunTest("expired-target-notBefore/main.test");
+  this->RunTest("expired-unconstrained-root/main.test");
+  this->RunTest("expired-constrained-root/main.test");
 }
 
 TYPED_TEST_P(VerifyCertificateChainSingleRootTest, TargetNotEndEntity) {
-  this->RunTest("target-not-end-entity.pem");
+  this->RunTest("target-not-end-entity/main.test");
 }
 
 TYPED_TEST_P(VerifyCertificateChainSingleRootTest, KeyUsage) {
-  this->RunTest("intermediate-lacks-signing-key-usage.pem");
-  this->RunTest("target-has-keycertsign-but-not-ca.pem");
-
-  this->RunTest("serverauth-ec-ku-decipheronly.pem");
-  this->RunTest("serverauth-ec-ku-digitalsignature.pem");
-  this->RunTest("serverauth-ec-ku-keyagreement.pem");
-  this->RunTest("serverauth-ec-ku-keyencipherment.pem");
-
-  this->RunTest("serverauth-rsa-ku-decipheronly.pem");
-  this->RunTest("serverauth-rsa-ku-digitalsignature.pem");
-  this->RunTest("serverauth-rsa-ku-keyagreement.pem");
-  this->RunTest("serverauth-rsa-ku-keyencipherment.pem");
+  this->RunTest("intermediate-lacks-signing-key-usage/main.test");
+  this->RunTest("target-has-keycertsign-but-not-ca/main.test");
+
+  this->RunTest("serverauth-ec-ku-decipheronly/main.test");
+  this->RunTest("serverauth-ec-ku-digitalsignature/main.test");
+  this->RunTest("serverauth-ec-ku-keyagreement/main.test");
+  this->RunTest("serverauth-ec-ku-keyencipherment/main.test");
+
+  this->RunTest("serverauth-rsa-ku-decipheronly/main.test");
+  this->RunTest("serverauth-rsa-ku-digitalsignature/main.test");
+  this->RunTest("serverauth-rsa-ku-keyagreement/main.test");
+  this->RunTest("serverauth-rsa-ku-keyencipherment/main.test");
 }
 
 TYPED_TEST_P(VerifyCertificateChainSingleRootTest, ExtendedKeyUsage) {
-  this->RunTest("target-lacks-eku.pem");
-  this->RunTest("target-restricts-eku-fail.pem");
-  this->RunTest("intermediate-restricts-eku-fail.pem");
-  this->RunTest("intermediate-restricts-eku-ok.pem");
-  this->RunTest("intermediate-sets-eku-any.pem");
-  this->RunTest("target-sets-eku-any.pem");
-  this->RunTest("constrained-root-bad-eku.pem");
-  this->RunTest("unconstrained-root-bad-eku.pem");
+  this->RunTest("target-lacks-eku/main.test");
+  this->RunTest("target-restricts-eku-fail/main.test");
+  this->RunTest("intermediate-restricts-eku-fail/main.test");
+  this->RunTest("intermediate-restricts-eku-ok/main.test");
+  this->RunTest("intermediate-sets-eku-any/main.test");
+  this->RunTest("target-sets-eku-any/main.test");
+  this->RunTest("constrained-root-bad-eku/main.test");
+  this->RunTest("unconstrained-root-bad-eku/main.test");
 }
 
 TYPED_TEST_P(VerifyCertificateChainSingleRootTest,
              IssuerAndSubjectNotByteForByteEqual) {
-  this->RunTest("issuer-and-subject-not-byte-for-byte-equal.pem");
-  this->RunTest("issuer-and-subject-not-byte-for-byte-equal-anchor.pem");
+  this->RunTest("issuer-and-subject-not-byte-for-byte-equal/target.test");
+  this->RunTest("issuer-and-subject-not-byte-for-byte-equal/anchor.test");
 }
 
 TYPED_TEST_P(VerifyCertificateChainSingleRootTest, TrustAnchorNotSelfSigned) {
-  this->RunTest("non-self-signed-root.pem");
-  this->RunTest("unconstrained-non-self-signed-root.pem");
-  this->RunTest("constrained-non-self-signed-root.pem");
+  this->RunTest("non-self-signed-root/main.test");
+  this->RunTest("unconstrained-non-self-signed-root/main.test");
+  this->RunTest("constrained-non-self-signed-root/main.test");
 }
 
 TYPED_TEST_P(VerifyCertificateChainSingleRootTest, KeyRollover) {
-  this->RunTest("key-rollover-oldchain.pem");
-  this->RunTest("key-rollover-rolloverchain.pem");
-  this->RunTest("key-rollover-longrolloverchain.pem");
-  this->RunTest("key-rollover-newchain.pem");
+  this->RunTest("key-rollover/oldchain.test");
+  this->RunTest("key-rollover/rolloverchain.test");
+  this->RunTest("key-rollover/longrolloverchain.test");
+  this->RunTest("key-rollover/newchain.test");
 }
 
 // TODO(eroman): Add test that invalid validity dates where the day or month