From 5435643695ec7f4e77fd4a2cda5bfa1222ec198f Mon Sep 17 00:00:00 2001
From: "wtc@chromium.org"
<wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 5 Oct 2011 21:49:42 +0000
Subject: Fix a regression introduced by
http://codereview.chromium.org/8050021. Only test USE_OPENSSL. Do not test
USE_NSS.
R=thomasvl@chromium.org
BUG=none
TEST=TransportSecurityStateTest.*
Review URL: http://codereview.chromium.org/8151002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104178 0039d316-1c4b-4281-b951-d872f2087c98
---
net/base/transport_security_state_unittest.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'net')
diff --git a/net/base/transport_security_state_unittest.cc b/net/base/transport_security_state_unittest.cc
index 2181cea..d60e6f2 100644
--- a/net/base/transport_security_state_unittest.cc
+++ b/net/base/transport_security_state_unittest.cc
@@ -16,10 +16,10 @@ namespace net {
class TransportSecurityStateTest : public testing::Test {
virtual void SetUp() {
-#if defined(USE_NSS)
- crypto::EnsureNSSInit();
-#elif defined(USE_OPENSSL)
+#if defined(USE_OPENSSL)
crypto::EnsureOpenSSLInit();
+#else
+ crypto::EnsureNSSInit();
#endif
}
};
--
cgit v1.1