Linux: bit hacky way to ensure Pepper plugins get loaded by zygote.

BUG=49702
TEST=Integrated PDF plugin should work on Linux Chrome, and --register-pepper-plugins works on Linux even with sandbox enabled.

Review URL: http://codereview.chromium.org/3031011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53977 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 1 deletions

diff --git a/chrome/common/pepper_plugin_registry.h b/chrome/common/pepper_plugin_registry.h
index 90d0d98..4c212e5 100644
--- a/chrome/common/pepper_plugin_registry.h
+++ b/chrome/common/pepper_plugin_registry.h
@@ -13,7 +13,10 @@
 #include "webkit/glue/plugins/pepper_plugin_module.h"
 
 struct PepperPluginInfo {
-  FilePath path;  // Internal plugins are of the form "internal-[name]".
+  PepperPluginInfo();  // Needed to initialize |is_internal|.
+
+  bool is_internal;  // Defaults to false (see constructor).
+  FilePath path;  // Internal plugins have "internal-[name]" as path.
   std::vector<std::string> mime_types;
   std::string name;
   std::string description;
@@ -31,6 +34,11 @@ class PepperPluginRegistry {
   // pepper plugin modules.
   static void GetList(std::vector<PepperPluginInfo>* plugins);
 
+  // Loads the (native) libraries but does not initialize them (i.e., does not
+  // call PPP_InitializeModule). This is needed by the zygote on Linux to get
+  // access to the plugins before entering the sandbox.
+  static void PreloadModules();
+
   pepper::PluginModule* GetModule(const FilePath& path) const;
 
  private:
@@ -38,6 +46,7 @@ class PepperPluginRegistry {
   static void GetExtraPlugins(std::vector<PepperPluginInfo>* plugins);
 
   struct InternalPluginInfo : public PepperPluginInfo {
+    InternalPluginInfo();  // Sets |is_internal|.
     pepper::PluginModule::EntryPoints entry_points;
   };
   typedef std::vector<InternalPluginInfo> InternalPluginInfoList;