Index: net/cert/test_root_certs_unittest.cc |
diff --git a/net/cert/test_root_certs_unittest.cc b/net/cert/test_root_certs_unittest.cc |
index 2f449e7651e99ce7ed9448ff1f41139e78c47c8e..d8d83ecddb903fa587f5bd465d59c7a0391c89ea 100644 |
--- a/net/cert/test_root_certs_unittest.cc |
+++ b/net/cert/test_root_certs_unittest.cc |
@@ -14,7 +14,7 @@ |
#include "net/test/cert_test_util.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-#if defined(USE_NSS_VERIFIER) |
+#if defined(USE_NSS_CERTS) |
#include <nss.h> |
#endif |
@@ -68,14 +68,6 @@ TEST(TestRootCertsTest, AddFromFile) { |
// the results of the rest of net_unittests, ensuring that the trust status |
// is properly being set and cleared. |
TEST(TestRootCertsTest, OverrideTrust) { |
-#if defined(USE_NSS_VERIFIER) |
davidben
2016/04/18 19:36:45
I think this is still needed, unless we're finally
svaldez
2016/04/18 20:21:39
Done.
|
- if (NSS_VersionCheck("3.14.2") && !NSS_VersionCheck("3.15")) { |
- // See http://bugzil.la/863947 for details |
- LOG(INFO) << "Skipping test for NSS 3.14.2 - NSS 3.15"; |
- return; |
- } |
-#endif |
- |
TestRootCerts* test_roots = TestRootCerts::GetInstance(); |
ASSERT_NE(static_cast<TestRootCerts*>(NULL), test_roots); |
EXPECT_TRUE(test_roots->IsEmpty()); |