Index: content/browser/ppapi_plugin_process_host.cc |
diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc |
index 92d7e4e5428ae9bade8ff556d23bd79a56a7a74c..518b4285d7b32e9d7947cecd94d31118bf1170ae 100644 |
--- a/content/browser/ppapi_plugin_process_host.cc |
+++ b/content/browser/ppapi_plugin_process_host.cc |
@@ -77,7 +77,7 @@ PpapiPluginProcessHost* PpapiPluginProcessHost::CreatePluginHost( |
const FilePath& profile_data_directory, |
net::HostResolver* host_resolver) { |
PpapiPluginProcessHost* plugin_host = new PpapiPluginProcessHost( |
- info.name, profile_data_directory, host_resolver); |
+ info, profile_data_directory, host_resolver); |
if (plugin_host->Init(info)) |
return plugin_host; |
@@ -114,7 +114,7 @@ void PpapiPluginProcessHost::OpenChannelToPlugin(Client* client) { |
} |
PpapiPluginProcessHost::PpapiPluginProcessHost( |
- const std::string& plugin_name, |
+ const content::PepperPluginInfo& info, |
const FilePath& profile_data_directory, |
net::HostResolver* host_resolver) |
: network_observer_(new PluginNetworkObserver(this)), |
@@ -124,10 +124,11 @@ PpapiPluginProcessHost::PpapiPluginProcessHost( |
content::PROCESS_TYPE_PPAPI_PLUGIN, this)); |
filter_ = new PepperMessageFilter( |
- PepperMessageFilter::PLUGIN, host_resolver); |
+ PepperMessageFilter::PLUGIN, host_resolver, |
+ ppapi::PpapiPermissions(info.permissions)); |
file_filter_ = new PepperTrustedFileMessageFilter( |
- process_->GetData().id, plugin_name, profile_data_directory); |
+ process_->GetData().id, info.name, profile_data_directory); |
process_->GetHost()->AddFilter(filter_.get()); |
process_->GetHost()->AddFilter(file_filter_.get()); |