Index: chrome/browser/ui/crypto_module_delegate_nss.h |
diff --git a/chrome/browser/ui/crypto_module_delegate_nss.h b/chrome/browser/ui/crypto_module_delegate_nss.h |
index f3b7c37e5b49ab9f02978b155024ec0a57034d8d..5fcc2a84bf978fd3e51fac9d68ed9e8308c6ffec 100644 |
--- a/chrome/browser/ui/crypto_module_delegate_nss.h |
+++ b/chrome/browser/ui/crypto_module_delegate_nss.h |
@@ -10,13 +10,21 @@ |
#include "base/compiler_specific.h" |
#include "base/synchronization/waitable_event.h" |
#include "chrome/browser/ui/crypto_module_password_dialog.h" |
+#include "components/cert_database/public/cert_database_service_io_part.h" |
#include "crypto/nss_crypto_module_delegate.h" |
#include "net/base/host_port_pair.h" |
+#include "net/cert/nss_cert_database.h" |
+ |
+class CertDatabaseServiceIOPart; |
namespace content { |
class ResourceContext; |
} |
+namespace net { |
+class NSSCertDatabase; |
+} |
+ |
// Delegate to handle unlocking a slot or indicating which slot to store a key |
// in. When passing to NSS functions which take a wincx argument, use the value |
// returned from the wincx() method. |
@@ -36,9 +44,8 @@ class ChromeNSSCryptoModuleDelegate |
// initialization will proceed asynchronously and the callback will be run |
// once the delegate is ready to use. In that case, the caller must ensure the |
// delegate remains alive until the callback is run. |
- bool InitializeSlot(content::ResourceContext* context, |
- const base::Closure& initialization_complete_callback) |
- WARN_UNUSED_RESULT; |
+ bool InitializeSlot(const base::Closure& initialization_complete_callback, |
+ CertDatabaseServiceIOPart* cert_db_io) WARN_UNUSED_RESULT; |
// crypto::NSSCryptoModuleDelegate implementation. |
virtual crypto::ScopedPK11Slot RequestSlot() OVERRIDE; |
@@ -53,7 +60,8 @@ class ChromeNSSCryptoModuleDelegate |
void GotPassword(const std::string& password); |
- void DidGetSlot(const base::Closure& callback, crypto::ScopedPK11Slot slot); |
+ void DidGetNSSCertDB(const base::Closure& callback, |
+ net::NSSCertDatabase* nss_cert_db); |
// Parameters displayed in the dialog. |
const chrome::CryptoModulePasswordReason reason_; |