Remove the deprecated NSSCertDatabase::GetInstance() .

chromeos/cert_loader.cc

 // Copyright (c) 2013 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 "chromeos/cert_loader.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 70 matching lines @@
 }
 
 void CertLoader::RemoveObserver(CertLoader::Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 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()));
 }
 
 bool CertLoader::IsHardwareBacked() const {
   if (force_hardware_backed_for_test_)
     return true;
   if (!database_)
     return false;
   crypto::ScopedPK11Slot slot(database_->GetPrivateSlot());
-  if (!slot)
-    return false;
+  DCHECK(slot);
   return PK11_IsHW(slot.get());
 }
 
 bool CertLoader::IsCertificateHardwareBacked(
     const net::X509Certificate* cert) const {
   if (!database_)
     return false;
   return database_->IsHardwareBacked(cert);
 }
 
@@ skipping 79 matching lines @@
   VLOG(1) << "OnCertAdded";
   LoadCertificates();
 }
 
 void CertLoader::OnCertRemoved(const net::X509Certificate* cert) {
   VLOG(1) << "OnCertRemoved";
   LoadCertificates();
 }
 
 }  // namespace chromeos