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

Unified Diff: chrome/browser/profiles/profile_io_data.cc

Issue 1082123003: Rename USE_NSS to USE_NSS_CERTS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-nss-certs
Patch Set: rebase Created 5 years, 8 months 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/io_thread.cc ('k') | chrome/browser/ssl/ssl_browser_tests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 2bd781cba00f19f27d5276fc59821b446cd0a0f7..fc63611fa8580098c5b360035dcfed8a558b2324 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -135,7 +135,7 @@
#include "net/ssl/client_cert_store_chromeos.h"
#endif // defined(OS_CHROMEOS)
-#if defined(USE_NSS)
+#if defined(USE_NSS_CERTS)
#include "chrome/browser/ui/crypto_module_delegate_nss.h"
#include "net/ssl/client_cert_store_nss.h"
#endif
@@ -341,7 +341,7 @@ void StartNSSInitOnIOThread(const std::string& username,
}
#endif // defined(OS_CHROMEOS)
-#if defined(USE_NSS)
+#if defined(USE_NSS_CERTS)
void InitializeAndPassKeygenHandler(
scoped_ptr<net::KeygenHandler> keygen_handler,
const base::Callback<void(scoped_ptr<net::KeygenHandler>)>& callback,
@@ -350,7 +350,7 @@ void InitializeAndPassKeygenHandler(
keygen_handler->set_crypto_module_delegate(delegate.Pass());
callback.Run(keygen_handler.Pass());
}
-#endif // defined(USE_NSS)
+#endif // defined(USE_NSS_CERTS)
void InvalidateContextGettersOnIO(
scoped_ptr<ProfileIOData::ChromeURLRequestContextGetterVector> getters) {
@@ -918,7 +918,7 @@ ProfileIOData::ResourceContext::CreateClientCertStore() {
io_data_->use_system_key_slot(), io_data_->username_hash())),
base::Bind(&CreateCryptoModuleBlockingPasswordDelegate,
chrome::kCryptoModulePasswordClientAuth)));
-#elif defined(USE_NSS)
+#elif defined(USE_NSS_CERTS)
return scoped_ptr<net::ClientCertStore>(new net::ClientCertStoreNSS(
base::Bind(&CreateCryptoModuleBlockingPasswordDelegate,
chrome::kCryptoModulePasswordClientAuth)));
@@ -942,7 +942,7 @@ void ProfileIOData::ResourceContext::CreateKeygenHandler(
const GURL& url,
const base::Callback<void(scoped_ptr<net::KeygenHandler>)>& callback) {
DCHECK(!callback.is_null());
-#if defined(USE_NSS)
+#if defined(USE_NSS_CERTS)
scoped_ptr<net::KeygenHandler> keygen_handler(
new net::KeygenHandler(key_size_in_bits, challenge_string, url));
« no previous file with comments | « chrome/browser/io_thread.cc ('k') | chrome/browser/ssl/ssl_browser_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698