Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(499)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/base/keygen_handler_unittest.cc

Issue 401623006: Extract ScopedTestNSSDB from nss_util. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« crypto/nss_util.cc ('K') | « net/BUILD.gn ('k') | net/cert/nss_cert_database_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/keygen_handler_unittest.cc
diff --git a/net/base/keygen_handler_unittest.cc b/net/base/keygen_handler_unittest.cc
index 2cb64743c8b4a7b5f74ce4e5b39e959c4c21ea7c..29623302d22df039a21dc133ab57d6f44e3d9b13 100644
--- a/net/base/keygen_handler_unittest.cc
+++ b/net/base/keygen_handler_unittest.cc
@@ -19,8 +19,7 @@
#if defined(USE_NSS)
#include <private/pprthred.h> // PR_DetachThread
#include "crypto/nss_crypto_module_delegate.h"
-#include "crypto/nss_util.h"
-#include "crypto/nss_util_internal.h"
+#include "crypto/scoped_test_nss_db.h"
#endif
namespace net {
@@ -59,8 +58,8 @@ class KeygenHandlerTest : public ::testing::Test {
#if defined(USE_NSS)
handler->set_crypto_module_delegate(
scoped_ptr<crypto::NSSCryptoModuleDelegate>(
- new StubCryptoModuleDelegate(
- crypto::ScopedPK11Slot(crypto::GetPersistentNSSKeySlot()))));
+ new StubCryptoModuleDelegate(crypto::ScopedPK11Slot(
+ PK11_ReferenceSlot(test_nss_db_.slot())))));
#endif
return handler.Pass();
}
« crypto/nss_util.cc ('K') | « net/BUILD.gn ('k') | net/cert/nss_cert_database_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698