Index: net/cert/nss_cert_database.h |
diff --git a/net/cert/nss_cert_database.h b/net/cert/nss_cert_database.h |
index d096f18d654ec9d1f48c08ad373a896c55b4d2b3..4851167aa48f603964220cae4f66f3be037ffce9 100644 |
--- a/net/cert/nss_cert_database.h |
+++ b/net/cert/nss_cert_database.h |
@@ -29,9 +29,6 @@ class ObserverListThreadSafe; |
namespace net { |
-class CryptoModule; |
-typedef std::vector<scoped_refptr<CryptoModule> > CryptoModuleList; |
- |
// Provides functions to manipulate the NSS certificate stores. |
// Forwards notifications about certificate changes to the global CertDatabase |
// singleton. |
@@ -145,8 +142,8 @@ class NET_EXPORT NSSCertDatabase { |
// Get all modules. |
// If |need_rw| is true, only writable modules will be returned. |
- // TODO(mattm): come up with better alternative to CryptoModuleList. |
- virtual void ListModules(CryptoModuleList* modules, bool need_rw) const; |
+ virtual void ListModules(std::vector<crypto::ScopedPK11Slot>* modules, |
+ bool need_rw) const; |
// Import certificates and private keys from PKCS #12 blob into the module. |
// If |is_extractable| is false, mark the private key as being unextractable |