| Index: chrome/browser/certificate_manager_model.cc
|
| diff --git a/chrome/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc
|
| index dd86c2353047f781097f6f7919bbae66bbf4a143..d1b43816a269e758be6be9af9e306557cbe92a32 100644
|
| --- a/chrome/browser/certificate_manager_model.cc
|
| +++ b/chrome/browser/certificate_manager_model.cc
|
| @@ -212,12 +212,12 @@ base::string16 CertificateManagerModel::GetColumnText(
|
| return rv;
|
| }
|
|
|
| -int CertificateManagerModel::ImportFromPKCS12(net::CryptoModule* module,
|
| +int CertificateManagerModel::ImportFromPKCS12(PK11SlotInfo* slot_info,
|
| const std::string& data,
|
| const base::string16& password,
|
| bool is_extractable) {
|
| - int result = cert_db_->ImportFromPKCS12(module, data, password,
|
| - is_extractable, NULL);
|
| + int result = cert_db_->ImportFromPKCS12(slot_info, data,
|
| + password, is_extractable, NULL);
|
| if (result == net::OK)
|
| Refresh();
|
| return result;
|
|
|