Chromium Code Reviews| Index: chrome/renderer/render_process_impl.cc |
| diff --git a/chrome/renderer/render_process_impl.cc b/chrome/renderer/render_process_impl.cc |
| index e3ff26353c74abd28722076227a8178d97e83c5d..dd35fe0efa8c46d0786cb6bfa78db8470f0ce69f 100644 |
| --- a/chrome/renderer/render_process_impl.cc |
| +++ b/chrome/renderer/render_process_impl.cc |
| @@ -19,6 +19,7 @@ |
| #include "base/file_util.h" |
| #include "base/message_loop.h" |
| #include "base/metrics/histogram.h" |
| +#include "base/nss_util.h" |
| #include "base/path_service.h" |
| #include "base/sys_info.h" |
| #include "base/utf_string_conversions.h" |
| @@ -159,6 +160,17 @@ RenderProcessImpl::RenderProcessImpl() |
| pdf.value().c_str(), "gdi32.dll", "GetFontData", GetFontDataPatch); |
| } |
| #endif |
| + |
| +#if defined(OS_LINUX) |
| + // Remoting requires NSS to function properly. |
| + if (command_line.HasSwitch(switches::kEnableRemoting)) { |
| + // 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. |
| + base::DisableNSSForkCheck(); |
| + base::EnsureNSPRInit(); |
|
wtc
2011/03/15 00:21:45
EnsureNSSNoDBInit calls EnsureNSPRInit, so you don
Alpha Left Google
2011/03/15 01:27:51
Done.
|
| + base::EnsureNSSNoDBInit(); |
| + } |
| +#endif |
| } |
| RenderProcessImpl::~RenderProcessImpl() { |