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

Unified Diff: crypto/scoped_test_nss_db.cc

Issue 956613002: Reland "Cut down /crypto and switch what is left of it to boringssl". (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Rebase. Created 5 years, 10 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
« no previous file with comments | « crypto/scoped_test_nss_db.h ('k') | crypto/scoped_test_system_nss_key_slot.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: crypto/scoped_test_nss_db.cc
diff --git a/crypto/scoped_test_nss_db.cc b/crypto/scoped_test_nss_db.cc
deleted file mode 100644
index 452c26d73e50500dd820b58f3821387404414448..0000000000000000000000000000000000000000
--- a/crypto/scoped_test_nss_db.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "crypto/scoped_test_nss_db.h"
-
-#include "base/logging.h"
-#include "base/threading/thread_restrictions.h"
-#include "crypto/nss_util.h"
-#include "crypto/nss_util_internal.h"
-
-namespace crypto {
-
-ScopedTestNSSDB::ScopedTestNSSDB() {
- EnsureNSSInit();
- // NSS is allowed to do IO on the current thread since dispatching
- // to a dedicated thread would still have the affect of blocking
- // the current thread, due to NSS's internal locking requirements
- base::ThreadRestrictions::ScopedAllowIO allow_io;
-
- if (!temp_dir_.CreateUniqueTempDir())
- return;
-
- const char kTestDescription[] = "Test DB";
- slot_ = OpenSoftwareNSSDB(temp_dir_.path(), kTestDescription);
-}
-
-ScopedTestNSSDB::~ScopedTestNSSDB() {
- // Don't close when NSS is < 3.15.1, because it would require an additional
- // sleep for 1 second after closing the database, due to
- // http://bugzil.la/875601.
- if (!NSS_VersionCheck("3.15.1")) {
- LOG(ERROR) << "NSS version is < 3.15.1, test DB will not be closed.";
- temp_dir_.Take();
- return;
- }
-
- // NSS is allowed to do IO on the current thread since dispatching
- // to a dedicated thread would still have the affect of blocking
- // the current thread, due to NSS's internal locking requirements
- base::ThreadRestrictions::ScopedAllowIO allow_io;
-
- if (slot_) {
- SECStatus status = SECMOD_CloseUserDB(slot_.get());
- if (status != SECSuccess)
- PLOG(ERROR) << "SECMOD_CloseUserDB failed: " << PORT_GetError();
- }
-
- if (!temp_dir_.Delete())
- LOG(ERROR) << "Could not delete temporary directory.";
-}
-
-} // namespace crypto
« no previous file with comments | « crypto/scoped_test_nss_db.h ('k') | crypto/scoped_test_system_nss_key_slot.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698