| Index: chrome/browser/certificate_manager_model.cc
|
| diff --git a/chrome/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc
|
| index d1b43816a269e758be6be9af9e306557cbe92a32..84e26cae7bc890a721d0ffe5bfc71816d345125e 100644
|
| --- a/chrome/browser/certificate_manager_model.cc
|
| +++ b/chrome/browser/certificate_manager_model.cc
|
| @@ -115,14 +115,13 @@ CertificateManagerModel::~CertificateManagerModel() {
|
|
|
| void CertificateManagerModel::Refresh() {
|
| DVLOG(1) << "refresh started";
|
| - net::CryptoModuleList modules;
|
| + std::vector<crypto::ScopedPK11Slot> modules;
|
| cert_db_->ListModules(&modules, false);
|
| DVLOG(1) << "refresh waiting for unlocking...";
|
| chrome::UnlockSlotsIfNecessary(
|
| - modules,
|
| - chrome::kCryptoModulePasswordListCerts,
|
| + std::move(modules), chrome::kCryptoModulePasswordListCerts,
|
| net::HostPortPair(), // unused.
|
| - NULL, // TODO(mattm): supply parent window.
|
| + NULL, // TODO(mattm): supply parent window.
|
| base::Bind(&CertificateManagerModel::RefreshSlotsUnlocked,
|
| base::Unretained(this)));
|
|
|
|
|