| 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..694eefdb5b93a48460214dcced21944bcea88f5a 100644
|
| --- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc
|
| +++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
|
| @@ -133,7 +133,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 +369,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 =
|
| + ppapi::PpapiPermissions::GetForCommandLine(info->permissions);
|
|
|
| // Out of process: have the browser start the plugin process for us.
|
| IPC::ChannelHandle channel_handle;
|
|
|