diff options
| -rw-r--r-- | chrome/renderer/chrome_render_process_observer.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc index 98517e2..c1ab347 100644 --- a/chrome/renderer/chrome_render_process_observer.cc +++ b/chrome/renderer/chrome_render_process_observer.cc @@ -195,14 +195,11 @@ ChromeRenderProcessObserver::ChromeRenderProcessObserver( #endif #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS) - // On platforms where we use system NSS libraries, the .so's must be loaded. - if (!command_line.HasSwitch(switches::kSingleProcess)) { - // We are going to fork to engage the sandbox and we have not loaded - // any security modules so it is safe to disable the fork check in NSS. - crypto::DisableNSSForkCheck(); - crypto::ForceNSSNoDBInit(); - crypto::EnsureNSSInit(); - } + // On platforms where we use system NSS shared libraries, + // initialize NSS now because it won't be able to load the .so's + // after we engage the sandbox. + if (!command_line.HasSwitch(switches::kSingleProcess)) + crypto::InitNSSSafely(); #elif defined(OS_WIN) // crypt32.dll is used to decode X509 certificates for Chromoting. // Only load this library when the feature is enabled. |