| Index: extensions/browser/api/socket/socket_api.cc
|
| diff --git a/extensions/browser/api/socket/socket_api.cc b/extensions/browser/api/socket/socket_api.cc
|
| index 229cfdd5edd8fcf486c585a0ac5fe5d1969ed916..62d7718f04485e236ebb5c2556f871971a74cdac 100644
|
| --- a/extensions/browser/api/socket/socket_api.cc
|
| +++ b/extensions/browser/api/socket/socket_api.cc
|
| @@ -210,8 +210,8 @@ void SocketConnectFunction::AsyncWorkStart() {
|
| }
|
|
|
| SocketPermission::CheckParam param(operation_type, hostname_, port_);
|
| - if (!PermissionsData::CheckAPIPermissionWithParam(
|
| - GetExtension(), APIPermission::kSocket, ¶m)) {
|
| + if (!PermissionsData::ForExtension(GetExtension())
|
| + ->CheckAPIPermissionWithParam(APIPermission::kSocket, ¶m)) {
|
| error_ = kPermissionError;
|
| SetResult(new base::FundamentalValue(-1));
|
| AsyncWorkCompleted();
|
| @@ -275,8 +275,8 @@ void SocketBindFunction::Work() {
|
| if (socket->GetSocketType() == Socket::TYPE_UDP) {
|
| SocketPermission::CheckParam param(
|
| SocketPermissionRequest::UDP_BIND, address_, port_);
|
| - if (!PermissionsData::CheckAPIPermissionWithParam(
|
| - GetExtension(), APIPermission::kSocket, ¶m)) {
|
| + if (!PermissionsData::ForExtension(GetExtension())
|
| + ->CheckAPIPermissionWithParam(APIPermission::kSocket, ¶m)) {
|
| error_ = kPermissionError;
|
| SetResult(new base::FundamentalValue(result));
|
| return;
|
| @@ -308,8 +308,8 @@ void SocketListenFunction::Work() {
|
| if (socket) {
|
| SocketPermission::CheckParam param(
|
| SocketPermissionRequest::TCP_LISTEN, params_->address, params_->port);
|
| - if (!PermissionsData::CheckAPIPermissionWithParam(
|
| - GetExtension(), APIPermission::kSocket, ¶m)) {
|
| + if (!PermissionsData::ForExtension(GetExtension())
|
| + ->CheckAPIPermissionWithParam(APIPermission::kSocket, ¶m)) {
|
| error_ = kPermissionError;
|
| SetResult(new base::FundamentalValue(result));
|
| return;
|
| @@ -510,8 +510,8 @@ void SocketSendToFunction::AsyncWorkStart() {
|
| if (socket_->GetSocketType() == Socket::TYPE_UDP) {
|
| SocketPermission::CheckParam param(
|
| SocketPermissionRequest::UDP_SEND_TO, hostname_, port_);
|
| - if (!PermissionsData::CheckAPIPermissionWithParam(
|
| - GetExtension(), APIPermission::kSocket, ¶m)) {
|
| + if (!PermissionsData::ForExtension(GetExtension())
|
| + ->CheckAPIPermissionWithParam(APIPermission::kSocket, ¶m)) {
|
| error_ = kPermissionError;
|
| SetResult(new base::FundamentalValue(-1));
|
| AsyncWorkCompleted();
|
| @@ -724,8 +724,8 @@ void SocketJoinGroupFunction::Work() {
|
| kWildcardAddress,
|
| kWildcardPort);
|
|
|
| - if (!PermissionsData::CheckAPIPermissionWithParam(
|
| - GetExtension(), APIPermission::kSocket, ¶m)) {
|
| + if (!PermissionsData::ForExtension(GetExtension())
|
| + ->CheckAPIPermissionWithParam(APIPermission::kSocket, ¶m)) {
|
| error_ = kPermissionError;
|
| SetResult(new base::FundamentalValue(result));
|
| return;
|
| @@ -768,8 +768,8 @@ void SocketLeaveGroupFunction::Work() {
|
| SocketPermissionRequest::UDP_MULTICAST_MEMBERSHIP,
|
| kWildcardAddress,
|
| kWildcardPort);
|
| - if (!PermissionsData::CheckAPIPermissionWithParam(
|
| - GetExtension(), APIPermission::kSocket, ¶m)) {
|
| + if (!PermissionsData::ForExtension(GetExtension())
|
| + ->CheckAPIPermissionWithParam(APIPermission::kSocket, ¶m)) {
|
| error_ = kPermissionError;
|
| SetResult(new base::FundamentalValue(result));
|
| return;
|
| @@ -875,8 +875,8 @@ void SocketGetJoinedGroupsFunction::Work() {
|
| SocketPermissionRequest::UDP_MULTICAST_MEMBERSHIP,
|
| kWildcardAddress,
|
| kWildcardPort);
|
| - if (!PermissionsData::CheckAPIPermissionWithParam(
|
| - GetExtension(), APIPermission::kSocket, ¶m)) {
|
| + if (!PermissionsData::ForExtension(GetExtension())
|
| + ->CheckAPIPermissionWithParam(APIPermission::kSocket, ¶m)) {
|
| error_ = kPermissionError;
|
| SetResult(new base::FundamentalValue(result));
|
| return;
|
|
|