diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 10:09:52 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 10:09:52 +0000 |
| commit | 30bb2810b94727989aaae07b4ff93d1a8f239e21 (patch) | |
| tree | 61ef7e671ed1fc3dd46a3918d93dfd639479105c /chromeos/cert_loader.cc | |
| parent | e9c8d3aaa6200b1a0683dcf3db0a39ca7a40d59f (diff) | |
| download | chromium_src-30bb2810b94727989aaae07b4ff93d1a8f239e21.zip chromium_src-30bb2810b94727989aaae07b4ff93d1a8f239e21.tar.gz chromium_src-30bb2810b94727989aaae07b4ff93d1a8f239e21.tar.bz2 | |
Remove the deprecated NSSCertDatabase::GetInstance() .
The NSSCertDatabase singleton for Linux is now maintained by nss_context_linux.cc .
BUG=329735
Review URL: https://codereview.chromium.org/405973003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285551 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/cert_loader.cc')
| -rw-r--r-- | chromeos/cert_loader.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chromeos/cert_loader.cc b/chromeos/cert_loader.cc index b72d43a..8c222795 100644 --- a/chromeos/cert_loader.cc +++ b/chromeos/cert_loader.cc @@ -88,8 +88,7 @@ int CertLoader::TPMTokenSlotID() const { if (!database_) return -1; crypto::ScopedPK11Slot slot(database_->GetPrivateSlot()); - if (!slot) - return -1; + DCHECK(slot); return static_cast<int>(PK11_GetSlotID(slot.get())); } @@ -99,8 +98,7 @@ bool CertLoader::IsHardwareBacked() const { if (!database_) return false; crypto::ScopedPK11Slot slot(database_->GetPrivateSlot()); - if (!slot) - return false; + DCHECK(slot); return PK11_IsHW(slot.get()); } |