commit ce65aff6d1ecab7ec4e6c1bc34eadd0a983c3879
author eroman <eroman@chromium.org> Sat Feb 04 00:05:32 2017
committer Commit bot <commit-bot@chromium.org> Sat Feb 04 00:05:32 2017
tree 9fb7d4f0e908d98d27188f0cf265f16868fa1717
parent 0e05b275042fd6114f705d341a24f58c8e6cec4a

Move CertVerifyProcMac unit-tests to their own file.

Review-Url: https://codereview.chromium.org/2670643008
Cr-Commit-Position: refs/heads/master@{#448111}

net/test/cert_test_util.cc

diff --git a/net/test/cert_test_util.cc b/net/test/cert_test_util.cc
index c6c412d..8da3aecf 100644
--- a/net/test/cert_test_util.cc
+++ b/net/test/cert_test_util.cc
@@ -8,7 +8,7 @@
 #include "base/files/file_util.h"
 #include "net/cert/ev_root_ca_metadata.h"
 #include "net/cert/x509_certificate.h"
-#include "testing/gtest/include/gtest/gtest.h"
+#include "net/test/test_data_directory.h"
 
 namespace net {
 
@@ -25,6 +25,23 @@
                                                          format);
 }
 
+::testing::AssertionResult LoadCertificateFiles(
+    const std::vector<std::string>& cert_filenames,
+    CertificateList* certs) {
+  certs->clear();
+  for (const std::string& filename : cert_filenames) {
+    scoped_refptr<X509Certificate> cert = CreateCertificateChainFromFile(
+        GetTestCertsDirectory(), filename, X509Certificate::FORMAT_AUTO);
+    if (!cert)
+      return ::testing::AssertionFailure()
+             << "Failed loading certificate from file: " << filename
+             << " (in directory: " << GetTestCertsDirectory().value() << ")";
+    certs->push_back(cert);
+  }
+
+  return ::testing::AssertionSuccess();
+}
+
 scoped_refptr<X509Certificate> CreateCertificateChainFromFile(
     const base::FilePath& certs_dir,
     const std::string& cert_file,

net/test/cert_test_util.h

diff --git a/net/test/cert_test_util.h b/net/test/cert_test_util.h
index f948bd8..f5b104b1 100644
--- a/net/test/cert_test_util.h
+++ b/net/test/cert_test_util.h
@@ -10,6 +10,7 @@
 #include "base/memory/ref_counted.h"
 #include "net/cert/x509_cert_types.h"
 #include "net/cert/x509_certificate.h"
+#include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(USE_NSS_CERTS)
 // From <pk11pub.h>
@@ -48,6 +49,13 @@
                                               const std::string& cert_file,
                                               int format);
 
+// Imports all the certificates given a list of filenames, and assigns the
+// result to |*certs|. The filenames are relative to the test certificates
+// directory.
+::testing::AssertionResult LoadCertificateFiles(
+    const std::vector<std::string>& cert_filenames,
+    CertificateList* certs);
+
 // Imports all of the certificates in |cert_file|, a file in |certs_dir|, into
 // a new X509Certificate. The first certificate in the chain will be used for
 // the returned cert, with any additional certificates configured as