Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2307)

Unified Diff: chrome/browser/net/nss_context_linux.cc

Issue 18121007: *WIP* Store NSS slots per profile. Move keygen to chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more refactoring Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/net/nss_context_chromeos.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/net/nss_context_linux.cc
diff --git a/chrome/browser/net/nss_context_linux.cc b/chrome/browser/net/nss_context_linux.cc
index d7373874fbcd40f8f2eaedf24a2c4827019d0398..38529ebedac035303177d8cfb49afea6d9660e95 100644
--- a/chrome/browser/net/nss_context_linux.cc
+++ b/chrome/browser/net/nss_context_linux.cc
@@ -6,6 +6,7 @@
#include "content/public/browser/browser_thread.h"
#include "crypto/nss_util_internal.h"
+#include "net/cert/nss_cert_database.h"
crypto::ScopedPK11Slot GetPublicNSSKeySlotForResourceContext(
content::ResourceContext* context) {
@@ -19,3 +20,10 @@ crypto::ScopedPK11Slot GetPrivateNSSKeySlotForResourceContext(
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
return crypto::ScopedPK11Slot(crypto::GetPrivateNSSKeySlot());
}
+
+net::NSSCertDatabase* GetNSSCertDatabaseForResourceContext(
+ content::ResourceContext* context,
+ const base::Callback<void(net::NSSCertDatabase*)>& callback) {
+ DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+ return net::NSSCertDatabase::GetInstance();
+}
« no previous file with comments | « chrome/browser/net/nss_context_chromeos.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698