diff options
| author | davidben <davidben@chromium.org> | 2015-07-08 16:02:39 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-08 23:03:14 +0000 |
| commit | 5b8de7cab29ba996a03d2862b59e3a4dc9e6559e (patch) | |
| tree | 1402542bfbe5617a490819e9799903bb83a7ff74 /content/ppapi_plugin | |
| parent | 58a912b6775e91677dd11ff643cbe98572a43c3f (diff) | |
| download | chromium_src-5b8de7cab29ba996a03d2862b59e3a4dc9e6559e.zip chromium_src-5b8de7cab29ba996a03d2862b59e3a4dc9e6559e.tar.gz chromium_src-5b8de7cab29ba996a03d2862b59e3a4dc9e6559e.tar.bz2 | |
Only initialize NSS in PpapiPluginMain on !USE_OPENSSL builds.
This dates to https://chromiumcodereview.appspot.com/11411013 which was added
to resolve the ClearKey CDM. ClearKey uses routines from //crypto which may use
NSS. But it doesn't need NSS in the chimera build, so we should limit this to
!USE_OPENSSL builds.
(The tests in question have also since moved to browser_tests and out of
//content.)
BUG=506323
Review URL: https://codereview.chromium.org/1222103005
Cr-Commit-Position: refs/heads/master@{#337935}
Diffstat (limited to 'content/ppapi_plugin')
| -rw-r--r-- | content/ppapi_plugin/ppapi_plugin_main.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/ppapi_plugin/ppapi_plugin_main.cc b/content/ppapi_plugin/ppapi_plugin_main.cc index 742a49b..b20bdd9 100644 --- a/content/ppapi_plugin/ppapi_plugin_main.cc +++ b/content/ppapi_plugin/ppapi_plugin_main.cc @@ -115,7 +115,7 @@ int PpapiPluginMain(const MainFunctionParams& parameters) { base::trace_event::TraceLog::GetInstance()->SetProcessSortIndex( kTraceEventPpapiProcessSortIndex); -#if defined(OS_LINUX) && defined(USE_NSS_CERTS) +#if defined(OS_LINUX) && !defined(USE_OPENSSL) // Some out-of-process PPAPI plugins use NSS. // NSS must be initialized before enabling the sandbox below. crypto::InitNSSSafely(); |