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

Unified Diff: net/ssl/client_cert_store_chromeos.cc

Issue 144423007: Make NSSCertDatabase::ListCerts work async on a worker thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: aa Created 6 years, 11 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
« net/cert/nss_cert_database.h ('K') | « net/ssl/client_cert_store_chromeos.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/ssl/client_cert_store_chromeos.cc
diff --git a/net/ssl/client_cert_store_chromeos.cc b/net/ssl/client_cert_store_chromeos.cc
index f357797e34b5d18b87766d81eaf1a42452635950..8636d3ca2a0c740f48ec5b77c0ac4cfece975ce5 100644
--- a/net/ssl/client_cert_store_chromeos.cc
+++ b/net/ssl/client_cert_store_chromeos.cc
@@ -16,7 +16,8 @@ ClientCertStoreChromeOS::ClientCertStoreChromeOS(
const std::string& username_hash,
const PasswordDelegateFactory& password_delegate_factory)
: ClientCertStoreNSS(password_delegate_factory),
- username_hash_(username_hash) {}
+ username_hash_(username_hash),
+ profile_filter_(new NSSProfileFilterChromeOS()) {}
ClientCertStoreChromeOS::~ClientCertStoreChromeOS() {}
@@ -50,8 +51,7 @@ void ClientCertStoreChromeOS::GetClientCertsImpl(CERTCertList* cert_list,
std::remove_if(
selected_certs->begin(),
selected_certs->end(),
- NSSProfileFilterChromeOS::CertNotAllowedForProfilePredicate(
- profile_filter_)),
+ NSSDatabaseFilter::CertNotAllowedPredicate(profile_filter_)),
selected_certs->end());
DVLOG(1) << "filtered " << pre_size - selected_certs->size() << " of "
<< pre_size << " certs";
@@ -62,7 +62,7 @@ void ClientCertStoreChromeOS::DidGetPrivateSlot(
CertificateList* selected_certs,
const base::Closure& callback,
crypto::ScopedPK11Slot private_slot) {
- profile_filter_.Init(crypto::GetPublicSlotForChromeOSUser(username_hash_),
+ profile_filter_->Init(crypto::GetPublicSlotForChromeOSUser(username_hash_),
private_slot.Pass());
ClientCertStoreNSS::GetClientCerts(*request, selected_certs, callback);
}
@@ -70,7 +70,7 @@ void ClientCertStoreChromeOS::DidGetPrivateSlot(
void ClientCertStoreChromeOS::InitForTesting(
crypto::ScopedPK11Slot public_slot,
crypto::ScopedPK11Slot private_slot) {
- profile_filter_.Init(public_slot.Pass(), private_slot.Pass());
+ profile_filter_->Init(public_slot.Pass(), private_slot.Pass());
}
bool ClientCertStoreChromeOS::SelectClientCertsForTesting(
« net/cert/nss_cert_database.h ('K') | « net/ssl/client_cert_store_chromeos.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698