diff options
| author | hclam@google.com <hclam@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-05 18:04:47 +0000 |
|---|---|---|
| committer | hclam@google.com <hclam@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-05 18:04:47 +0000 |
| commit | 3e43b3a8b107a57a311a6f8c279c3683917e587c (patch) | |
| tree | dc2469ae5deb120c5e20fb72e87aaba0a3729ba8 /chrome/renderer | |
| parent | 778d599df45c985286cd70898187ecf7a6284eeb (diff) | |
| download | chromium_src-3e43b3a8b107a57a311a6f8c279c3683917e587c.zip chromium_src-3e43b3a8b107a57a311a6f8c279c3683917e587c.tar.gz chromium_src-3e43b3a8b107a57a311a6f8c279c3683917e587c.tar.bz2 | |
Fix NSS in single process mode
We used to initialize NSS without DB in single process mode. This caused going
to https site faile in single process mode. This patch fixes it.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/6670133
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80487 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/render_process_impl.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/renderer/render_process_impl.cc b/chrome/renderer/render_process_impl.cc index 917b3f6..e6c3193 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. |