| Index: content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc
|
| diff --git a/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc b/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc
|
| index e3ef1f382cb40160bff5d234d4a61a53c3f9ff77..477b257d38d5516ec70fc60e34a0dd722f28882c 100644
|
| --- a/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc
|
| +++ b/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc
|
| @@ -33,24 +33,6 @@ using ppapi::NetAddressPrivateImpl;
|
|
|
| namespace content {
|
|
|
| -namespace {
|
| -
|
| -bool CanUseSocketAPIs(const SocketPermissionRequest& request,
|
| - bool external_plugin,
|
| - bool private_api,
|
| - int render_process_id,
|
| - int render_view_id) {
|
| - RenderViewHost* render_view_host = RenderViewHost::FromID(render_process_id,
|
| - render_view_id);
|
| - return render_view_host &&
|
| - pepper_socket_utils::CanUseSocketAPIs(external_plugin,
|
| - private_api,
|
| - request,
|
| - render_view_host);
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| PepperUDPSocketMessageFilter::PepperUDPSocketMessageFilter(
|
| BrowserPpapiHostImpl* host,
|
| PP_Instance instance,
|
| @@ -177,8 +159,9 @@ int32_t PepperUDPSocketMessageFilter::OnMsgBind(
|
| SocketPermissionRequest request =
|
| pepper_socket_utils::CreateSocketPermissionRequest(
|
| SocketPermissionRequest::UDP_BIND, addr);
|
| - if (!CanUseSocketAPIs(request, external_plugin_, private_api_,
|
| - render_process_id_, render_view_id_)) {
|
| + if (!pepper_socket_utils::CanUseSocketAPIs(external_plugin_, private_api_,
|
| + request, render_process_id_,
|
| + render_view_id_)) {
|
| return PP_ERROR_NOACCESS;
|
| }
|
|
|
| @@ -239,8 +222,9 @@ int32_t PepperUDPSocketMessageFilter::OnMsgSendTo(
|
| SocketPermissionRequest request =
|
| pepper_socket_utils::CreateSocketPermissionRequest(
|
| SocketPermissionRequest::UDP_SEND_TO, addr);
|
| - if (!CanUseSocketAPIs(request, external_plugin_, private_api_,
|
| - render_process_id_, render_view_id_)) {
|
| + if (!pepper_socket_utils::CanUseSocketAPIs(external_plugin_, private_api_,
|
| + request, render_process_id_,
|
| + render_view_id_)) {
|
| return PP_ERROR_NOACCESS;
|
| }
|
|
|
|
|