diff options
| author | jorgelo@chromium.org <jorgelo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-30 01:24:24 +0000 |
|---|---|---|
| committer | jorgelo@chromium.org <jorgelo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-30 01:24:24 +0000 |
| commit | ef5348ca56e8d77797d4e820db0d20eb37278139 (patch) | |
| tree | 1a2a197025b2244714e4665de00fc1e0ce5eb8f4 /chrome/renderer/chrome_render_process_observer.cc | |
| parent | b27d144ed9f66c68d06103a36582d4227a3d6b81 (diff) | |
| download | chromium_src-ef5348ca56e8d77797d4e820db0d20eb37278139.zip chromium_src-ef5348ca56e8d77797d4e820db0d20eb37278139.tar.gz chromium_src-ef5348ca56e8d77797d4e820db0d20eb37278139.tar.bz2 | |
Replace NSS init with wrapper.
https://chromiumcodereview.appspot.com/11411013/ added a nice wrapper
for the functions needed to initialize NSS. Use that wrapper here.
BUG=None
TEST=linux trybots
Review URL: https://chromiumcodereview.appspot.com/11411025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170325 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/chrome_render_process_observer.cc')
| -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. |