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 3e254c64b4bc85118c4d20a4e2a7bf0aff66b4e1..e708bc699aa5d7f6c8f2219ead655d754c1ebbf7 100644 |
--- a/chrome/plugin/chrome_content_plugin_client.cc |
+++ b/chrome/plugin/chrome_content_plugin_client.cc |
@@ -35,8 +35,7 @@ void ChromeContentPluginClient::PreSandboxInitialization() { |
#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(); |
- crypto::EnsureNSSInit(); |
+ crypto::InitNSSSafely(); |
jln (very slow on Chromium)
2015/07/07 17:45:36
It looks like this shouldn't be needed because con
davidben
2015/07/07 18:14:48
Yeah, it's a bit of a mess. I should probably have
Ryan Sleevi
2015/07/08 10:54:25
Right, I think we actually want to delete this cod
|
#elif defined(OS_WIN) |
// crypt32.dll is used to decode X509 certificates for Chromoting. |
base::NativeLibraryLoadError error; |