Refactor some certificate verification tests in preparation to adding

net/data/verify_certificate_chain_unittest/generate-key-rollover.py

 #!/usr/bin/python
 # Copyright (c) 2016 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.
 
 """A certificate tree with two self-signed root certificates(oldroot, newroot),
 and a third root certificate (newrootrollover) which has the same key as newroot
 but is signed by oldroot, all with the same subject and issuer.
 There are two intermediates with the same key, subject and issuer
 (oldintermediate signed by oldroot, and newintermediate signed by newroot).
@@ skipping 51 matching lines @@
 # Intermediate signed by newroot. Same key as oldintermediate.
 newintermediate = common.create_intermediate_certificate('Intermediate',
                                                          newroot)
 newintermediate.set_key_path(oldintermediate.get_key_path())
 newintermediate.set_validity_range(JANUARY_2_2015_UTC,
                                    common.JANUARY_1_2016_UTC)
 
 # Target certificate.
 target = common.create_end_entity_certificate('Target', oldintermediate)
 
-oldchain = [target, oldintermediate]
-rolloverchain = [target, newintermediate, newrootrollover]
-longrolloverchain = [target, newintermediate, newroot, newrootrollover]
-oldtrusted = [oldroot]
+oldtrusted = common.TrustAnchor(oldroot, constrained=False)
+newtrusted = common.TrustAnchor(newroot, constrained=False)
 
-newchain = [target, newintermediate]
-newtrusted = [newroot]
+test = common.TestData()
+test.description = __doc__
+test.verify_result = True
+test.utc_time = common.DEFAULT_TIME
 
-time = common.DEFAULT_TIME
-verify_result = True
+# Write out a test for oldchain.
+test.chain = [target, oldintermediate]
+test.trust_anchor = oldtrusted
+test.write_to_file("key-rollover-oldchain.pem")
 
-common.write_test_file(__doc__, oldchain, oldtrusted, time, verify_result,
-                       out_pem="key-rollover-oldchain.pem")
-common.write_test_file(__doc__, rolloverchain, oldtrusted, time, verify_result,
-                       out_pem="key-rollover-rolloverchain.pem")
-common.write_test_file(__doc__, longrolloverchain, oldtrusted, time,
-                       verify_result,
-                       out_pem="key-rollover-longrolloverchain.pem")
-common.write_test_file(__doc__, newchain, newtrusted, time, verify_result,
-                       out_pem="key-rollover-newchain.pem")
+# Write out a test for rolloverchain.
+test.chain = [target, newintermediate, newrootrollover]
+test.trust_anchor = oldtrusted
+test.write_to_file("key-rollover-rolloverchain.pem")
 
+# Write out a test for longrolloverchain.
+test.chain = [target, newintermediate, newroot, newrootrollover]
+test.trust_anchor = oldtrusted
+test.write_to_file("key-rollover-longrolloverchain.pem")
+
+# Write out a test for newchain.
+test.chain = [target, newintermediate]
+test.trust_anchor = newtrusted
+test.write_to_file("key-rollover-newchain.pem")