Refactor PermissionsData pt1

extensions/browser/api/socket/socket_api.cc

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, &param)) {
+  if (!PermissionsData::ForExtension(GetExtension())
+           ->CheckAPIPermissionWithParam(APIPermission::kSocket, &param)) {
     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, &param)) {
+    if (!PermissionsData::ForExtension(GetExtension())
+             ->CheckAPIPermissionWithParam(APIPermission::kSocket, &param)) {
       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, &param)) {
+    if (!PermissionsData::ForExtension(GetExtension())
+             ->CheckAPIPermissionWithParam(APIPermission::kSocket, &param)) {
       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, &param)) {
+    if (!PermissionsData::ForExtension(GetExtension())
+             ->CheckAPIPermissionWithParam(APIPermission::kSocket, &param)) {
       error_ = kPermissionError;
       SetResult(new base::FundamentalValue(-1));
       AsyncWorkCompleted();
@@ -724,8 +724,8 @@ void SocketJoinGroupFunction::Work() {
       kWildcardAddress,
       kWildcardPort);
 
-  if (!PermissionsData::CheckAPIPermissionWithParam(
-          GetExtension(), APIPermission::kSocket, &param)) {
+  if (!PermissionsData::ForExtension(GetExtension())
+           ->CheckAPIPermissionWithParam(APIPermission::kSocket, &param)) {
     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, &param)) {
+  if (!PermissionsData::ForExtension(GetExtension())
+           ->CheckAPIPermissionWithParam(APIPermission::kSocket, &param)) {
     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, &param)) {
+  if (!PermissionsData::ForExtension(GetExtension())

[not at google - send to devlin, 2014/06/02 23:20:06]

so much of this. almost seems like there should be
ExtensionFunction::GetPermissionsData() but that sounds confusing and ultimately
unnecessary.

[Devlin, 2014/06/03 15:28:21]

Yeah.... let's hold off on that for now.

+           ->CheckAPIPermissionWithParam(APIPermission::kSocket, &param)) {
     error_ = kPermissionError;
     SetResult(new base::FundamentalValue(result));
     return;