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

Unified Diff: chrome/plugin/chrome_content_plugin_client.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: chrome/plugin/chrome_content_plugin_client.cc
diff --git a/chrome/plugin/chrome_content_plugin_client.cc b/chrome/plugin/chrome_content_plugin_client.cc
index fd4c01322dea39e661c03ae48edd4f073ffdfb1e..3cfce2851cd9241ed5c571a73ebc60fc3d6ef6bb 100644
--- a/chrome/plugin/chrome_content_plugin_client.cc
+++ b/chrome/plugin/chrome_content_plugin_client.cc
@@ -12,7 +12,7 @@
#if defined(OS_WIN)
#include "base/logging.h"
#include "base/native_library.h"
-#elif defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS)
+#elif defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS_CERTS)
#include "crypto/nss_util.h"
#endif
#endif
@@ -31,7 +31,7 @@ void ChromeContentPluginClient::PreSandboxInitialization() {
#if defined(ENABLE_REMOTING)
// Load crypto libraries for the Chromoting client plugin.
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS_CERTS)
// On platforms where we use system NSS libraries, the .so's must be loaded
// before the sandbox is initialized.
crypto::ForceNSSNoDBInit();
« no previous file with comments | « chrome/common/net/x509_certificate_model_unittest.cc ('k') | chrome/renderer/chrome_render_process_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698