diff options
author | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 08:35:13 +0000 |
---|---|---|
committer | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 08:35:13 +0000 |
commit | e1399c972c8643dea3e8109c958597141369ea6a (patch) | |
tree | aefa9da99118205371bd699c7327474bb2ce1451 /crypto/nss_util.cc | |
parent | ca6966bf908defc280bef151c6964a4fc1429708 (diff) | |
download | chromium_src-e1399c972c8643dea3e8109c958597141369ea6a.zip chromium_src-e1399c972c8643dea3e8109c958597141369ea6a.tar.gz chromium_src-e1399c972c8643dea3e8109c958597141369ea6a.tar.bz2 |
Implement ScopedTestNSSDB instead of OpenTestNSSDB()
BUG=136950
Review URL: https://chromiumcodereview.appspot.com/11174006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162327 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/nss_util.cc')
-rw-r--r-- | crypto/nss_util.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc index db89a70..6d86743 100644 --- a/crypto/nss_util.cc +++ b/crypto/nss_util.cc @@ -702,8 +702,13 @@ bool CheckNSSVersion(const char* version) { } #if defined(USE_NSS) -bool OpenTestNSSDB() { - return g_nss_singleton.Get().OpenTestNSSDB(); +ScopedTestNSSDB::ScopedTestNSSDB() + : is_open_(g_nss_singleton.Get().OpenTestNSSDB()) { +} + +ScopedTestNSSDB::~ScopedTestNSSDB() { + // TODO(mattm): Close the dababase once NSS 3.14 is required, + // which fixes https://bugzilla.mozilla.org/show_bug.cgi?id=588269 } base::Lock* GetNSSWriteLock() { |