Refactor PermissionsData pt1

extensions/browser/api/socket/socket_api.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/browser/api/socket/socket_api.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/containers/hash_tables.h"
@@ skipping 192 matching lines @@
     case Socket::TYPE_UDP:
       operation_type = SocketPermissionRequest::UDP_SEND_TO;
       break;
     default:
       NOTREACHED() << "Unknown socket type.";
       operation_type = SocketPermissionRequest::NONE;
       break;
   }
 
   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();
     return;
   }
 
   StartDnsLookup(hostname_);
 }
 
 void SocketConnectFunction::AfterDnsLookup(int lookup_result) {
@@ skipping 43 matching lines @@
 
   if (!socket) {
     error_ = kSocketNotFoundError;
     SetResult(new base::FundamentalValue(result));
     return;
   }
 
   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;
     }
   } else if (socket->GetSocketType() == Socket::TYPE_TCP) {
     error_ = kTCPSocketBindError;
     SetResult(new base::FundamentalValue(result));
     return;
   }
 
@@ skipping 11 matching lines @@
   return true;
 }
 
 void SocketListenFunction::Work() {
   int result = -1;
 
   Socket* socket = GetSocket(params_->socket_id);
   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;
     }
 
     result =
         socket->Listen(params_->address,
                        params_->port,
                        params_->backlog.get() ? *params_->backlog.get() : 5,
                        &error_);
@@ skipping 180 matching lines @@
   if (!socket_) {
     error_ = kSocketNotFoundError;
     SetResult(new base::FundamentalValue(-1));
     AsyncWorkCompleted();
     return;
   }
 
   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();
       return;
     }
   }
 
   StartDnsLookup(hostname_);
 }
 
@@ skipping 192 matching lines @@
     error_ = kMulticastSocketTypeError;
     SetResult(new base::FundamentalValue(result));
     return;
   }
 
   SocketPermission::CheckParam param(
       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;
   }
 
   result = static_cast<UDPSocket*>(socket)->JoinGroup(params_->address);
   if (result != 0) {
     error_ = net::ErrorToString(result);
   }
   SetResult(new base::FundamentalValue(result));
@@ skipping 22 matching lines @@
   if (socket->GetSocketType() != Socket::TYPE_UDP) {
     error_ = kMulticastSocketTypeError;
     SetResult(new base::FundamentalValue(result));
     return;
   }
 
   SocketPermission::CheckParam param(
       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;
   }
 
   result = static_cast<UDPSocket*>(socket)->LeaveGroup(params_->address);
   if (result != 0)
     error_ = net::ErrorToString(result);
   SetResult(new base::FundamentalValue(result));
 }
@@ skipping 85 matching lines @@
   if (socket->GetSocketType() != Socket::TYPE_UDP) {
     error_ = kMulticastSocketTypeError;
     SetResult(new base::FundamentalValue(result));
     return;
   }
 
   SocketPermission::CheckParam param(
       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;
   }
 
   base::ListValue* values = new base::ListValue();
   values->AppendStrings((std::vector<std::string>&)static_cast<UDPSocket*>(
                             socket)->GetJoinedGroups());
   SetResult(values);
 }
 
 }  // namespace extensions