Add permissions buts for Pepper plugins.

This patch doesn't actually hook anything up, but it plumbs them in for the laces we'll need it.

Review URL: https://chromiumcodereview.appspot.com/10735011

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

3 files changed, 12 insertions, 3 deletions

diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index 5ce0bf2..0efcbf7 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -407,7 +407,8 @@ PluginModule::EntryPoints::EntryPoints()
 
 PluginModule::PluginModule(const std::string& name,
                            const FilePath& path,
-                           PluginDelegate::ModuleLifetime* lifetime_delegate)
+                           PluginDelegate::ModuleLifetime* lifetime_delegate,
+                           const ::ppapi::PpapiPermissions& perms)
     : lifetime_delegate_(lifetime_delegate),
       callback_tracker_(new ::ppapi::CallbackTracker),
       is_in_destructor_(false),
@@ -416,6 +417,7 @@ PluginModule::PluginModule(const std::string& name,
       library_(NULL),
       name_(name),
       path_(path),
+      permissions_(perms),
       reserve_instance_id_(NULL),
       nacl_ipc_proxy_(false) {
   // Ensure the globals object is created.
diff --git a/webkit/plugins/ppapi/plugin_module.h b/webkit/plugins/ppapi/plugin_module.h
index d9d78ba..827546f 100644
--- a/webkit/plugins/ppapi/plugin_module.h
+++ b/webkit/plugins/ppapi/plugin_module.h
@@ -21,6 +21,7 @@
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/ppb.h"
 #include "ppapi/c/ppb_core.h"
+#include "ppapi/shared_impl/ppapi_permissions.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/webkit_plugins_export.h"
 
@@ -70,7 +71,8 @@ class WEBKIT_PLUGINS_EXPORT PluginModule :
   // tracks which modules are alive.
   PluginModule(const std::string& name,
                const FilePath& path,
-               PluginDelegate::ModuleLifetime* lifetime_delegate);
+               PluginDelegate::ModuleLifetime* lifetime_delegate,
+               const ::ppapi::PpapiPermissions& perms);
 
   ~PluginModule();
 
@@ -105,6 +107,7 @@ class WEBKIT_PLUGINS_EXPORT PluginModule :
 
   const std::string& name() const { return name_; }
   const FilePath& path() const { return path_; }
+  const ::ppapi::PpapiPermissions permissions() const { return permissions_; }
 
   PluginInstance* CreateInstance(PluginDelegate* delegate);
 
@@ -197,6 +200,8 @@ class WEBKIT_PLUGINS_EXPORT PluginModule :
   const std::string name_;
   const FilePath path_;
 
+  ::ppapi::PpapiPermissions permissions_;
+
   // Non-owning pointers to all instances associated with this module. When
   // there are no more instances, this object should be deleted.
   PluginInstanceSet instances_;
diff --git a/webkit/plugins/ppapi/ppapi_unittest.cc b/webkit/plugins/ppapi/ppapi_unittest.cc
index 8b3fec50..14c42e8 100644
--- a/webkit/plugins/ppapi/ppapi_unittest.cc
+++ b/webkit/plugins/ppapi/ppapi_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppp_instance.h"
+#include "ppapi/shared_impl/ppapi_permissions.h"
 #include "webkit/plugins/ppapi/mock_plugin_delegate.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_interface_factory.h"
@@ -75,7 +76,8 @@ void PpapiUnittest::SetUp() {
   delegate_.reset(NewPluginDelegate());
 
   // Initialize the mock module.
-  module_ = new PluginModule("Mock plugin", FilePath(), this);
+  module_ = new PluginModule("Mock plugin", FilePath(), this,
+                             ::ppapi::PpapiPermissions());
   PluginModule::EntryPoints entry_points;
   entry_points.get_interface = &MockGetInterface;
   entry_points.initialize_module = &MockInitializeModule;