Refactor how net/data/verify_certificate_chain_unittest/*

net/cert/internal/test_helpers.h

 // Copyright 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.
 
 #ifndef NET_CERT_INTERNAL_TEST_HELPERS_H_
 #define NET_CERT_INTERNAL_TEST_HELPERS_H_
 
 #include <stddef.h>
 
 #include <ostream>
@@ skipping 77 matching lines @@
 
   // Details on the trustedness of the last certificate.
   CertificateTrust last_cert_trust;
 
   // The time to use when verifying the chain.
   der::GeneralizedTime time;
 
   // The Key Purpose to use when verifying the chain.
   KeyPurpose key_purpose = KeyPurpose::ANY_EKU;
 
-  // The expected result from verification.
-  bool expected_result = false;
+  // The expected errors/warnings from verification (as a string).
+  std::string expected_errors;
 
-  // The expected errors from verification (as a string).
-  std::string expected_errors;
+  // Returns true if |expected_errors| contains any high severity errors (a
+  // non-empty expected_errors doesn't necessarily mean verification is
+  // expected to fail, as it may have contained warnings).
+  bool HasHighSeverityErrors() const;
 };
 
 // Reads a test case from |file_path_ascii| (which is relative to //src).
 // Generally |file_path_ascii| will start with:
 //   net/data/verify_certificate_chain_unittest/
-void ReadVerifyCertChainTestFromFile(const std::string& file_path_ascii,
+bool ReadVerifyCertChainTestFromFile(const std::string& file_path_ascii,
                                      VerifyCertChainTest* test);
 
+// Reads a certificate chain from |file_path_ascii|
+bool ReadCertChainFromFile(const std::string& file_path_ascii,
+                           ParsedCertificateList* chain);
+
 // Reads a data file relative to the src root directory.
 std::string ReadTestFileToString(const std::string& file_path_ascii);
 
 }  // namespace net
 
 #endif  // NET_CERT_INTERNAL_TEST_HELPERS_H_