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 804274451a025b7ea4eb8864400d3f9242e28a38..c188e89aa8e275fb03aa8f389763865382ad9a32 100644 |
--- a/content/browser/ppapi_plugin_process_host.cc |
+++ b/content/browser/ppapi_plugin_process_host.cc |
@@ -19,6 +19,7 @@ |
#include "content/public/browser/content_browser_client.h" |
#include "content/public/common/content_switches.h" |
#include "content/public/common/pepper_plugin_info.h" |
+#include "content/public/common/pepper_permissions_config.h" |
#include "content/public/common/process_type.h" |
#include "ipc/ipc_switches.h" |
#include "net/base/network_change_notifier.h" |
@@ -161,7 +162,8 @@ PpapiPluginProcessHost::PpapiPluginProcessHost( |
const content::PepperPluginInfo& info, |
const FilePath& profile_data_directory, |
net::HostResolver* host_resolver) |
- : network_observer_(new PluginNetworkObserver(this)), |
+ : permissions_(content::CreatePepperPermissionsForPlugin(info)), |
+ network_observer_(new PluginNetworkObserver(this)), |
profile_data_directory_(profile_data_directory), |
is_broker_(false) { |
process_.reset(new BrowserChildProcessHostImpl( |
@@ -170,8 +172,7 @@ PpapiPluginProcessHost::PpapiPluginProcessHost( |
filter_ = new PepperMessageFilter(PepperMessageFilter::PLUGIN, |
host_resolver); |
- ppapi::PpapiPermissions permissions(info.permissions); |
- host_impl_ = new content::BrowserPpapiHostImpl(this, permissions); |
+ host_impl_ = new content::BrowserPpapiHostImpl(this, permissions_); |
file_filter_ = new PepperTrustedFileMessageFilter( |
process_->GetData().id, info.name, profile_data_directory); |
@@ -315,7 +316,7 @@ void PpapiPluginProcessHost::OnChannelConnected(int32 peer_pid) { |
// This will actually load the plugin. Errors will actually not be reported |
// back at this point. Instead, the plugin will fail to establish the |
// connections when we request them on behalf of the renderer(s). |
- Send(new PpapiMsg_LoadPlugin(plugin_path_)); |
+ Send(new PpapiMsg_LoadPlugin(plugin_path_, permissions_)); |
// Process all pending channel requests from the renderers. |
for (size_t i = 0; i < pending_requests_.size(); i++) |