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

Unified Diff: content/ppapi_plugin/ppapi_plugin_main.cc

Issue 11411013: Initialize NSS in the PPAPI process for ClearKey CDM. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Upload something that actually compiles. Created 8 years, 1 month 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 | crypto/nss_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/ppapi_plugin/ppapi_plugin_main.cc
diff --git a/content/ppapi_plugin/ppapi_plugin_main.cc b/content/ppapi_plugin/ppapi_plugin_main.cc
index 8e1515c1e954bf6bcb915a5874e0f90671263f29..b60b0c448ea911d79e77d45ffbe11fa070e42c67 100644
--- a/content/ppapi_plugin/ppapi_plugin_main.cc
+++ b/content/ppapi_plugin/ppapi_plugin_main.cc
@@ -8,6 +8,7 @@
#include "base/message_loop.h"
#include "base/threading/platform_thread.h"
#include "build/build_config.h"
+#include "crypto/nss_util.h"
#include "content/common/child_process.h"
#include "content/ppapi_plugin/ppapi_thread.h"
#include "content/public/common/content_switches.h"
@@ -78,6 +79,11 @@ int PpapiPluginMain(const MainFunctionParams& parameters) {
MessageLoop main_message_loop;
base::PlatformThread::SetName("CrPPAPIMain");
+#if defined(OS_LINUX) && defined(USE_NSS)
+ // Some out-of-process PPAPI plugins need access to NSS.
+ crypto::WarmUpNSSSafely();
+#endif
+
#if defined(OS_LINUX)
InitializeSandbox();
Ryan Sleevi 2012/11/15 19:48:02 Just showing my own ignorance here: This call ini
Jorge Lucangeli Obes 2012/11/15 19:50:25 Correct. There's no "initializing" the SUID sandbo
#endif
« no previous file with comments | « no previous file | crypto/nss_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698