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

Unified Diff: components/nacl/loader/nacl_helper_linux.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
Index: components/nacl/loader/nacl_helper_linux.cc
diff --git a/components/nacl/loader/nacl_helper_linux.cc b/components/nacl/loader/nacl_helper_linux.cc
index 7076044e31d9a26d80a09d5c75eed79cb6dc0582..6670eb248ee47cec6c2ddc7b2cd6a95f0e12385b 100644
--- a/components/nacl/loader/nacl_helper_linux.cc
+++ b/components/nacl/loader/nacl_helper_linux.cc
@@ -438,7 +438,7 @@ int main(int argc, char* argv[]) {
// NSS is only needed for SFI NaCl.
// Allows NSS to fopen() /dev/urandom.
sandbox::InitLibcUrandomOverrides();
-#if defined(USE_NSS)
+#if defined(USE_NSS_CERTS)
// Configure NSS for use inside the NaCl process.
// The fork check has not caused problems for NaCl, but this appears to be
// best practice (see other places LoadNSSLibraries is called.)
@@ -450,7 +450,7 @@ int main(int argc, char* argv[]) {
// Load shared libraries before sandbox is raised.
// NSS is needed to perform hashing for validation caching.
crypto::LoadNSSLibraries();
-#endif // defined(USE_NSS)
+#endif // defined(USE_NSS_CERTS)
#endif // defined(OS_NACL_NONSFI)
const NaClLoaderSystemInfo system_info = {
#if !defined(OS_NACL_NONSFI)
« no previous file with comments | « chromeos/network/onc/onc_certificate_importer_impl_unittest.cc ('k') | components/nacl/loader/nacl_validation_query.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698