| Index: chrome/renderer/render_process_impl.cc
|
| diff --git a/chrome/renderer/render_process_impl.cc b/chrome/renderer/render_process_impl.cc
|
| index 9d63c77ba467490bc6bd783438f9074bab3ee585..0266fbb9511394dac0df699a035e8a9eb5653c18 100644
|
| --- a/chrome/renderer/render_process_impl.cc
|
| +++ b/chrome/renderer/render_process_impl.cc
|
| @@ -161,7 +161,9 @@ RenderProcessImpl::RenderProcessImpl()
|
|
|
| #if defined(OS_LINUX)
|
| // Remoting requires NSS to function properly.
|
| - if (command_line.HasSwitch(switches::kEnableRemoting)) {
|
| +
|
| + if (!command_line.HasSwitch(switches::kSingleProcess) &&
|
| + command_line.HasSwitch(switches::kEnableRemoting)) {
|
| #if defined(USE_NSS)
|
| // 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.
|
|
|