| Index: net/cert/nss_cert_database_chromeos.cc
|
| diff --git a/net/cert/nss_cert_database_chromeos.cc b/net/cert/nss_cert_database_chromeos.cc
|
| index 936287c2204fa75f5b350540d4363d910952760e..379cba3d256a5ae7bcac301b7edff787571e099b 100644
|
| --- a/net/cert/nss_cert_database_chromeos.cc
|
| +++ b/net/cert/nss_cert_database_chromeos.cc
|
| @@ -16,26 +16,31 @@ NSSCertDatabaseChromeOS::NSSCertDatabaseChromeOS(
|
| crypto::ScopedPK11Slot public_slot,
|
| crypto::ScopedPK11Slot private_slot)
|
| : public_slot_(public_slot.Pass()),
|
| - private_slot_(private_slot.Pass()) {
|
| - profile_filter_.Init(GetPublicSlot(), GetPrivateSlot());
|
| + private_slot_(private_slot.Pass()),
|
| + profile_filter_(new NSSProfileFilterChromeOS) {
|
| + profile_filter_->Init(GetPublicSlot(), GetPrivateSlot());
|
| }
|
|
|
| NSSCertDatabaseChromeOS::~NSSCertDatabaseChromeOS() {}
|
|
|
| -void NSSCertDatabaseChromeOS::ListCerts(CertificateList* certs) {
|
| - NSSCertDatabase::ListCerts(certs);
|
| +void NSSCertDatabaseChromeOS::ListCertsSync(CertificateList* certs) {
|
| + NSSCertDatabase::ListCertsSync(certs);
|
|
|
| size_t pre_size = certs->size();
|
| certs->erase(std::remove_if(
|
| certs->begin(),
|
| certs->end(),
|
| - NSSProfileFilterChromeOS::CertNotAllowedForProfilePredicate(
|
| - profile_filter_)),
|
| + NSSDatabaseFilter::CertNotAllowedPredicate(profile_filter_)),
|
| certs->end());
|
| DVLOG(1) << "filtered " << pre_size - certs->size() << " of " << pre_size
|
| << " certs";
|
| }
|
|
|
| +scoped_refptr<NSSDatabaseFilter>
|
| +NSSCertDatabaseChromeOS::GetDatabaseFilter() const {
|
| + return profile_filter_;
|
| +}
|
| +
|
| crypto::ScopedPK11Slot NSSCertDatabaseChromeOS::GetPublicSlot() const {
|
| return crypto::ScopedPK11Slot(
|
| public_slot_ ? PK11_ReferenceSlot(public_slot_.get()) : NULL);
|
| @@ -46,17 +51,16 @@ crypto::ScopedPK11Slot NSSCertDatabaseChromeOS::GetPrivateSlot() const {
|
| private_slot_ ? PK11_ReferenceSlot(private_slot_.get()) : NULL);
|
| }
|
|
|
| -void NSSCertDatabaseChromeOS::ListModules(CryptoModuleList* modules,
|
| - bool need_rw) const {
|
| - NSSCertDatabase::ListModules(modules, need_rw);
|
| +void NSSCertDatabaseChromeOS::ListModulesSync(CryptoModuleList* modules,
|
| + bool need_rw) const {
|
| + NSSCertDatabase::ListModulesSync(modules, need_rw);
|
|
|
| size_t pre_size = modules->size();
|
| modules->erase(
|
| std::remove_if(
|
| modules->begin(),
|
| modules->end(),
|
| - NSSProfileFilterChromeOS::ModuleNotAllowedForProfilePredicate(
|
| - profile_filter_)),
|
| + NSSDatabaseFilter::ModuleNotAllowedPredicate(profile_filter_)),
|
| modules->end());
|
| DVLOG(1) << "filtered " << pre_size - modules->size() << " of " << pre_size
|
| << " modules";
|
|
|