Index: net/base/x509_certificate_unittest.cc |
diff --git a/net/base/x509_certificate_unittest.cc b/net/base/x509_certificate_unittest.cc |
index 31173e4f469c7f24d8a0ff2017636fa070251a51..24bb26351ab304174224a5230ffc126dd23a6df9 100644 |
--- a/net/base/x509_certificate_unittest.cc |
+++ b/net/base/x509_certificate_unittest.cc |
@@ -7,10 +7,10 @@ |
#include "base/path_service.h" |
#include "base/pickle.h" |
#include "net/base/cert_status_flags.h" |
-#include "net/base/cert_test_util.h" |
#include "net/base/cert_verify_result.h" |
#include "net/base/net_errors.h" |
#include "net/base/test_certificate_data.h" |
+#include "net/base/test_root_certs.h" |
#include "net/base/x509_certificate.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -427,13 +427,8 @@ TEST(X509CertificateTest, UnoSoftCertParsing) { |
EXPECT_NE(0, verify_result.cert_status & CERT_STATUS_AUTHORITY_INVALID); |
} |
-#if defined(USE_NSS) || defined(USE_OPENSSL) |
// A regression test for http://crbug.com/31497. |
// This certificate will expire on 2012-04-08. |
-// TODO(wtc): we can't run this test on Mac because MacTrustedCertificates |
-// can hold only one additional trusted root certificate for unit tests. |
-// TODO(wtc): we can't run this test on Windows because LoadTemporaryRootCert |
-// isn't implemented (http//crbug.com/8470). |
TEST(X509CertificateTest, IntermediateCARequireExplicitPolicy) { |
FilePath certs_dir = GetTestCertsDirectory(); |
@@ -448,9 +443,8 @@ TEST(X509CertificateTest, IntermediateCARequireExplicitPolicy) { |
ASSERT_NE(static_cast<X509Certificate*>(NULL), intermediate_cert); |
FilePath root_cert_path = certs_dir.AppendASCII("dod_root_ca_2_cert.der"); |
- scoped_refptr<X509Certificate> root_cert = |
- LoadTemporaryRootCert(root_cert_path); |
- ASSERT_NE(static_cast<X509Certificate*>(NULL), root_cert); |
+ TestRootCerts* root_certs = TestRootCerts::GetInstance(); |
+ ASSERT_TRUE(root_certs->AddFromFile(root_cert_path)); |
X509Certificate::OSCertHandles intermediates; |
intermediates.push_back(intermediate_cert->os_cert_handle()); |
@@ -464,8 +458,8 @@ TEST(X509CertificateTest, IntermediateCARequireExplicitPolicy) { |
int error = cert_chain->Verify("www.us.army.mil", flags, &verify_result); |
EXPECT_EQ(OK, error); |
EXPECT_EQ(0, verify_result.cert_status); |
+ root_certs->Clear(); |
} |
-#endif |
// Tests X509Certificate::Cache via X509Certificate::CreateFromHandle. We |
// call X509Certificate::CreateFromHandle several times and observe whether |