Index: content/renderer/pepper/pepper_plugin_delegate_impl.cc |
diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc |
index f7c724fc8ac8e25642ab0b73a7901b71eefe36d7..f70df9698fe183155654aab681f9728ca41fc64d 100644 |
--- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc |
+++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc |
@@ -31,6 +31,7 @@ |
#include "content/public/common/content_switches.h" |
#include "content/public/common/context_menu_params.h" |
#include "content/public/common/media_stream_request.h" |
+#include "content/public/common/pepper_permissions_config.h" |
#include "content/public/common/referrer.h" |
#include "content/public/renderer/content_renderer_client.h" |
#include "content/public/renderer/renderer_restrict_dispatch_group.h" |
@@ -133,7 +134,7 @@ class HostDispatcherWrapper |
dispatcher_delegate_.reset(new PepperProxyChannelDelegateImpl); |
dispatcher_.reset(new ppapi::proxy::HostDispatcher( |
- module_->pp_module(), local_get_interface, filter)); |
+ module_->pp_module(), local_get_interface, filter, permissions_)); |
if (!dispatcher_->InitHostWithChannel(dispatcher_delegate_.get(), |
channel_handle, |
@@ -369,7 +370,9 @@ PepperPluginDelegateImpl::CreatePepperPluginModule( |
// In-process plugin not preloaded, it probably couldn't be initialized. |
return scoped_refptr<webkit::ppapi::PluginModule>(); |
} |
- ppapi::PpapiPermissions permissions(info->permissions); |
+ |
+ ppapi::PpapiPermissions permissions = |
+ content::CreatePepperPermissionsForPlugin(*info); |
// Out of process: have the browser start the plugin process for us. |
IPC::ChannelHandle channel_handle; |