Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9888)

Unified Diff: chrome/renderer/render_process_impl.cc

Issue 6670133: Fix NSS in single process mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698