Index: chrome/browser/profiles/profile_io_data.h |
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h |
index c472b3f033b913d3779a6f14a1ddf8ac4fa368d0..b809e2f6e2798e07b0eb008e4bd074b151096d90 100644 |
--- a/chrome/browser/profiles/profile_io_data.h |
+++ b/chrome/browser/profiles/profile_io_data.h |
@@ -25,6 +25,10 @@ |
#include "net/http/http_network_session.h" |
#include "net/url_request/url_request_job_factory.h" |
+#if defined(USE_NSS) |
+#include "crypto/scoped_nss_types.h" |
+#endif |
+ |
class ChromeHttpUserAgentSettings; |
class ChromeNetworkDelegate; |
class CookieSettings; |
@@ -190,6 +194,11 @@ class ProfileIOData { |
} |
#endif |
+#if defined(USE_NSS) |
+ crypto::ScopedPK11Slot GetPublicNSSKeySlot() const; |
+ crypto::ScopedPK11Slot GetPrivateNSSKeySlot() const; |
+#endif |
+ |
// Initialize the member needed to track the metrics enabled state. This is |
// only to be called on the UI thread. |
void InitializeMetricsEnabledStateOnUIThread(); |
@@ -277,6 +286,11 @@ class ProfileIOData { |
net::CertTrustAnchorProvider* trust_anchor_provider; |
#endif |
+#if defined(USE_NSS) |
+ crypto::ScopedPK11Slot public_slot; |
+ crypto::ScopedPK11Slot private_slot; |
+#endif |
+ |
// The profile this struct was populated from. It's passed as a void* to |
// ensure it's not accidently used on the IO thread. Before using it on the |
// UI thread, call ProfileManager::IsValidProfile to ensure it's alive. |
@@ -492,6 +506,10 @@ class ProfileIOData { |
#if defined(OS_CHROMEOS) |
mutable scoped_ptr<net::CertVerifier> cert_verifier_; |
#endif |
+#if defined(USE_NSS) |
+ mutable crypto::ScopedPK11Slot public_slot_; |
+ mutable crypto::ScopedPK11Slot private_slot_; |
+#endif |
#if defined(ENABLE_NOTIFICATIONS) |
mutable DesktopNotificationService* notification_service_; |