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

Unified Diff: net/cert/nss_cert_database.cc

Issue 2711113002: net: remove CryptoModuleList typedef (Closed)
Patch Set: more std::moves Created 3 years, 10 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
« no previous file with comments | « net/cert/nss_cert_database.h ('k') | net/cert/nss_cert_database_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/cert/nss_cert_database.cc
diff --git a/net/cert/nss_cert_database.cc b/net/cert/nss_cert_database.cc
index 14aa891ed6244d883dfcc5ea6b848857ae5813b3..3fe89b89269439dca084ea543a11ab5d988697a6 100644
--- a/net/cert/nss_cert_database.cc
+++ b/net/cert/nss_cert_database.cc
@@ -145,7 +145,7 @@ crypto::ScopedPK11Slot NSSCertDatabase::GetPrivateSlot() const {
return crypto::ScopedPK11Slot(PK11_ReferenceSlot(private_slot_.get()));
}
-void NSSCertDatabase::ListModules(CryptoModuleList* modules,
+void NSSCertDatabase::ListModules(std::vector<crypto::ScopedPK11Slot>* modules,
bool need_rw) const {
modules->clear();
@@ -162,7 +162,8 @@ void NSSCertDatabase::ListModules(CryptoModuleList* modules,
PK11SlotListElement* slot_element = PK11_GetFirstSafe(slot_list.get());
while (slot_element) {
- modules->push_back(CryptoModule::CreateFromHandle(slot_element->slot));
+ modules->push_back(
+ crypto::ScopedPK11Slot(PK11_ReferenceSlot(slot_element->slot)));
slot_element = PK11_GetNextSafe(slot_list.get(), slot_element,
PR_FALSE); // restart
}
« no previous file with comments | « net/cert/nss_cert_database.h ('k') | net/cert/nss_cert_database_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698