| commit | 5b8de7cab29ba996a03d2862b59e3a4dc9e6559e | |
| author | davidben <davidben@chromium.org> | |
| Wed, 8 Jul 2015 23:02:39 +0000 (8 16:02 -0700) | ||
| committer | Commit bot <commit-bot@chromium.org> | |
| Wed, 8 Jul 2015 23:03:14 +0000 (8 23:03 +0000) | ||
| tree | 1402542bfbe5617a490819e9799903bb83a7ff74 | treesnapshot (tar.gz zip) |
| parent | 58a912b6775e91677dd11ff643cbe98572a43c3f | commitdiff |
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}
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}
| content/ppapi_plugin/ppapi_plugin_main.cc | diffblobblamehistory |