diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-18 11:15:39 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-18 11:15:39 +0000 |
| commit | eeb0855be6b312f19729c474b7405c4e337435ef (patch) | |
| tree | 38358b6a98211de09de50afd91cce4754934addb /chrome/renderer/render_process_impl.cc | |
| parent | 777cc4315e0efc2f8cad678093d5f32c53845224 (diff) | |
| download | chromium_src-eeb0855be6b312f19729c474b7405c4e337435ef.zip chromium_src-eeb0855be6b312f19729c474b7405c4e337435ef.tar.gz chromium_src-eeb0855be6b312f19729c474b7405c4e337435ef.tar.bz2 | |
Guards "remoting" initialization on the renderer side.
Following http://codereview.chromium.org/6684018,
remoting requires NSS to be initialized in the render side.
This change allows to compile with openssl.
BUG=none
TEST=compiles with use_openssl=1
Review URL: http://codereview.chromium.org/6665065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78681 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_process_impl.cc')
| -rw-r--r-- | chrome/renderer/render_process_impl.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/renderer/render_process_impl.cc b/chrome/renderer/render_process_impl.cc index 75e59ab..aa890fc 100644 --- a/chrome/renderer/render_process_impl.cc +++ b/chrome/renderer/render_process_impl.cc @@ -161,11 +161,16 @@ RenderProcessImpl::RenderProcessImpl() #if defined(OS_LINUX) // Remoting requires NSS to function properly. if (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. base::DisableNSSForkCheck(); base::ForceNSSNoDBInit(); base::EnsureNSSInit(); +#else + // TODO(bulach): implement openssl support. + NOTREACHED() << "Remoting is not supported for openssl"; +#endif } #endif } |