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. |
brettw
2012/11/16 19:09:59
Can this comment explicitly say that this needs to
Jorge Lucangeli Obes
2012/11/16 19:41:43
Done.
|
+ crypto::WarmUpNSSSafely(); |
+#endif |
+ |
#if defined(OS_LINUX) |
InitializeSandbox(); |
#endif |