Refactor some certificate verification tests in preparation to adding

net/data/verify_certificate_chain_unittest/generate-expired-intermediate.py

Index: net/data/verify_certificate_chain_unittest/generate-expired-intermediate.py
diff --git a/net/data/verify_certificate_chain_unittest/generate-expired-intermediate.py b/net/data/verify_certificate_chain_unittest/generate-expired-intermediate.py
index 708d7344f39e9b6f1049a0f9ddd69126dede9ee6..bb84bb709eb1a2091b2ae70eb399064d1656f9b1 100755
--- a/net/data/verify_certificate_chain_unittest/generate-expired-intermediate.py
+++ b/net/data/verify_certificate_chain_unittest/generate-expired-intermediate.py
@@ -8,7 +8,7 @@
 
 import common
 
-# Self-signed root certificate (part of trust store).
+# Self-signed root certificate (used as trust anchor).
 root = common.create_self_signed_root_certificate('Root')
 root.set_validity_range(common.JANUARY_1_2015_UTC, common.JANUARY_1_2016_UTC)
 
@@ -21,12 +21,15 @@ intermediate.set_validity_range(common.JANUARY_1_2015_UTC,
 target = common.create_end_entity_certificate('Target', intermediate)
 target.set_validity_range(common.JANUARY_1_2015_UTC, common.JANUARY_1_2016_UTC)
 
-chain = [target, intermediate]
-trusted = [root]
+# Write the test chain to a file.
+test = common.TestData()
+test.description = __doc__
+test.chain = [target, intermediate]
+test.trust_anchor = common.TrustAnchor(root, constrained=False)
 
 # Both the root and target are valid at this time, however the
 # intermediate certificate is not.
-time = common.MARCH_2_2015_UTC
-verify_result = False
+test.utc_time = common.MARCH_2_2015_UTC
+test.verify_result = False
 
-common.write_test_file(__doc__, chain, trusted, time, verify_result)
+test.write_to_file(common.get_default_pem_path())