summaryrefslogtreecommitdiffstats
path: root/net/base
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-05 21:49:42 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-05 21:49:42 +0000
commit5435643695ec7f4e77fd4a2cda5bfa1222ec198f (patch)
tree947a73bc2b9f4ea90a2cfc608058a5ec011efe93 /net/base
parenta22a04852c9e9260b193e9a08469d95eb2092417 (diff)
downloadchromium_src-5435643695ec7f4e77fd4a2cda5bfa1222ec198f.zip
chromium_src-5435643695ec7f4e77fd4a2cda5bfa1222ec198f.tar.gz
chromium_src-5435643695ec7f4e77fd4a2cda5bfa1222ec198f.tar.bz2
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
Diffstat (limited to 'net/base')
-rw-r--r--net/base/transport_security_state_unittest.cc6
1 files changed, 3 insertions, 3 deletions
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
}
};