Move CertVerifyProcMac unit-tests to their own file.

net/test/cert_test_util.h

 // Copyright (c) 2012 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_TEST_CERT_TEST_UTIL_H_
 #define NET_TEST_CERT_TEST_UTIL_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "net/cert/x509_cert_types.h"
 #include "net/cert/x509_certificate.h"
+#include "net/test/test_data_directory.h"
+#include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(USE_NSS_CERTS)
 // From <pk11pub.h>
 typedef struct PK11SlotInfoStr PK11SlotInfo;
 #endif
 
 namespace base {
 class FilePath;
 }
 
@@ skipping 18 matching lines @@
     const std::string& key_filename,
     PK11SlotInfo* slot);
 #endif
 
 // Imports all of the certificates in |cert_file|, a file in |certs_dir|, into a
 // CertificateList.
 CertificateList CreateCertificateListFromFile(const base::FilePath& certs_dir,
                                               const std::string& cert_file,
                                               int format);
 
+// Template helper to load a series of certificate files into a CertificateList.
+// Like CreateCertificateListFromFile, except it can load a
+// series of individual certificates (to make the tests clearer).
+template <size_t N>
+void LoadCertificateFiles(const char* const (&cert_files)[N],
+                          CertificateList* certs) {

[Ryan Sleevi, 2017/02/02 22:20:12]

A thought: It might be worth refactoring this a little to

template <typename ForwardIterator>
CertificateList LoadCertificateFiles(ForwardIterator first, ForwardIterator
last) {
  CertificateList result;
  for (; first != last; ++first) {
    SCOPED_TRACE(first);
   scoped_refptr<X509Certificate> cert = CreateCertificateChainFromFile(...);
   result.push_back(cert);
  }
  return certs;
}


Context for this is I generally get nervous about exposing the size_t N approach
in headers, because it's limited to a specific type - fixed arrays. The Iterator
approach still lets us use arrays (for std::begin(certs_files),
std::end(certs_files)), but allows a bit more flexibility when exposing
something as part of a public interface.

[eroman, 2017/02/02 23:27:17]

PTAL, I have removed the template parameter all-together.

+  certs->clear();
+  for (size_t i = 0; i < N; ++i) {
+    SCOPED_TRACE(cert_files[i]);
+    scoped_refptr<X509Certificate> cert = CreateCertificateChainFromFile(
+        GetTestCertsDirectory(), cert_files[i], X509Certificate::FORMAT_AUTO);
+    ASSERT_TRUE(cert);
+    certs->push_back(cert);
+  }
+}
+
 // 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
 // intermediate certificates.
 scoped_refptr<X509Certificate> CreateCertificateChainFromFile(
     const base::FilePath& certs_dir,
     const std::string& cert_file,
     int format);
 
 // Imports a single certificate from |cert_file|.
@@ skipping 16 matching lines @@
   ~ScopedTestEVPolicy();
 
  private:
   SHA1HashValue fingerprint_;
   EVRootCAMetadata* const ev_root_ca_metadata_;
 };
 
 }  // namespace net
 
 #endif  // NET_TEST_CERT_TEST_UTIL_H_