| Index: net/base/keygen_handler_unittest.cc
|
| diff --git a/net/base/keygen_handler_unittest.cc b/net/base/keygen_handler_unittest.cc
|
| index 2357328e42c16fc15445f8d3ab7abd98fb97cd63..74d91467eba867ca352558823622478bc7252d8b 100644
|
| --- a/net/base/keygen_handler_unittest.cc
|
| +++ b/net/base/keygen_handler_unittest.cc
|
| @@ -16,7 +16,7 @@
|
| #include "build/build_config.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| -#if defined(USE_NSS)
|
| +#if defined(USE_NSS_CERTS)
|
| #include <private/pprthred.h> // PR_DetachThread
|
| #include "crypto/nss_crypto_module_delegate.h"
|
| #include "crypto/scoped_test_nss_db.h"
|
| @@ -26,7 +26,7 @@ namespace net {
|
|
|
| namespace {
|
|
|
| -#if defined(USE_NSS)
|
| +#if defined(USE_NSS_CERTS)
|
| class StubCryptoModuleDelegate : public crypto::NSSCryptoModuleDelegate {
|
| public:
|
| explicit StubCryptoModuleDelegate(crypto::ScopedPK11Slot slot)
|
| @@ -55,7 +55,7 @@ class KeygenHandlerTest : public ::testing::Test {
|
| scoped_ptr<KeygenHandler> CreateKeygenHandler() {
|
| scoped_ptr<KeygenHandler> handler(new KeygenHandler(
|
| 768, "some challenge", GURL("http://www.example.com")));
|
| -#if defined(USE_NSS)
|
| +#if defined(USE_NSS_CERTS)
|
| handler->set_crypto_module_delegate(
|
| scoped_ptr<crypto::NSSCryptoModuleDelegate>(
|
| new StubCryptoModuleDelegate(crypto::ScopedPK11Slot(
|
| @@ -65,7 +65,7 @@ class KeygenHandlerTest : public ::testing::Test {
|
| }
|
|
|
| private:
|
| -#if defined(USE_NSS)
|
| +#if defined(USE_NSS_CERTS)
|
| crypto::ScopedTestNSSDB test_nss_db_;
|
| #endif
|
| };
|
| @@ -124,7 +124,7 @@ void ConcurrencyTestCallback(const std::string& challenge,
|
| handler->set_stores_key(false); // Don't leave the key-pair behind.
|
| *result = handler->GenKeyAndSignChallenge();
|
| event->Signal();
|
| -#if defined(USE_NSS)
|
| +#if defined(USE_NSS_CERTS)
|
| // Detach the thread from NSPR.
|
| // Calling NSS functions attaches the thread to NSPR, which stores
|
| // the NSPR thread ID in thread-specific data.
|
|
|