| 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 41852a742a73bc72c8ec3d5a8130d6e15bc0a452..60f7f2ee64a8b4cdc49f9e2ada25d1996dbbc1d6 100644
|
| --- a/net/cert/nss_cert_database_chromeos.cc
|
| +++ b/net/cert/nss_cert_database_chromeos.cc
|
| @@ -21,8 +21,7 @@ namespace net {
|
| NSSCertDatabaseChromeOS::NSSCertDatabaseChromeOS(
|
| crypto::ScopedPK11Slot public_slot,
|
| crypto::ScopedPK11Slot private_slot)
|
| - : public_slot_(public_slot.Pass()),
|
| - private_slot_(private_slot.Pass()) {
|
| + : NSSCertDatabase(public_slot.Pass(), private_slot.Pass()) {
|
| profile_filter_.Init(GetPublicSlot(), GetPrivateSlot());
|
| }
|
|
|
| @@ -46,16 +45,6 @@ void NSSCertDatabaseChromeOS::ListCerts(
|
| base::Bind(callback, base::Passed(&certs)));
|
| }
|
|
|
| -crypto::ScopedPK11Slot NSSCertDatabaseChromeOS::GetPublicSlot() const {
|
| - return crypto::ScopedPK11Slot(
|
| - public_slot_ ? PK11_ReferenceSlot(public_slot_.get()) : NULL);
|
| -}
|
| -
|
| -crypto::ScopedPK11Slot NSSCertDatabaseChromeOS::GetPrivateSlot() const {
|
| - return crypto::ScopedPK11Slot(
|
| - private_slot_ ? PK11_ReferenceSlot(private_slot_.get()) : NULL);
|
| -}
|
| -
|
| void NSSCertDatabaseChromeOS::ListModules(CryptoModuleList* modules,
|
| bool need_rw) const {
|
| NSSCertDatabase::ListModules(modules, need_rw);
|
|
|