Refactor how net/data/verify_certificate_chain_unittest/*

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

Index: net/data/verify_certificate_chain_unittest/generate-expired-target.py
diff --git a/net/data/verify_certificate_chain_unittest/generate-expired-target.py b/net/data/verify_certificate_chain_unittest/generate-expired-target.py
deleted file mode 100755
index 924567695174ee9a28341939e43a9834e3ef4891..0000000000000000000000000000000000000000
--- a/net/data/verify_certificate_chain_unittest/generate-expired-target.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/python
-# Copyright (c) 2015 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.
-
-"""Certificate chain with 1 intermediate, where the target is expired (violates
-validity.notAfter). Verification is expected to fail."""
-
-import common
-
-# 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)
-
-# Intermediate certificate.
-intermediate = common.create_intermediate_certificate('Intermediate', root)
-intermediate.set_validity_range(common.JANUARY_1_2015_UTC,
-                                common.JANUARY_1_2016_UTC)
-
-# Target certificate.
-target = common.create_end_entity_certificate('Target', intermediate)
-target.set_validity_range(common.JANUARY_1_2015_UTC, common.MARCH_1_2015_UTC)
-
-chain = [target, intermediate]
-trusted = common.TrustAnchor(root, constrained=False)
-
-# Both the root and intermediate are valid at this time, however the
-# target is not.
-time = common.MARCH_2_2015_UTC
-key_purpose = common.DEFAULT_KEY_PURPOSE
-verify_result = False
-errors = """----- Certificate i=0 (CN=Target) -----
-ERROR: Time is after notAfter
-
-"""
-
-common.write_test_file(__doc__, chain, trusted, time, key_purpose,
-                       verify_result, errors)