Support socket endpoint permissions for AppsV2 Socket API.

chrome/browser/extensions/api/permissions/permissions_api.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/api/permissions/permissions_api.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/permissions_updater.h"
@@ skipping 63 matching lines @@
 bool RemovePermissionsFunction::RunImpl() {
   scoped_ptr<Remove::Params> params(Remove::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   scoped_refptr<PermissionSet> permissions =
       helpers::UnpackPermissionSet(params->permissions, &error_);
   if (!permissions.get())
     return false;
 
   const extensions::Extension* extension = GetExtension();
-  PermissionsInfo* info = PermissionsInfo::GetInstance();
 
   // Make sure they're only trying to remove permissions supported by this API.
   APIPermissionSet apis = permissions->apis();
   for (APIPermissionSet::const_iterator i = apis.begin();
        i != apis.end(); ++i) {
-    const APIPermission* api = info->GetByID(*i);
-    if (!api->supports_optional()) {
+    if (!i->permission()->supports_optional()) {
       error_ = ExtensionErrorUtils::FormatErrorMessage(
-          kNotWhitelistedError, api->name());
+          kNotWhitelistedError, i->name());
       return false;
     }
   }
 
   // Make sure we don't remove any required pemissions.
   const PermissionSet* required = extension->required_permission_set();
   scoped_refptr<PermissionSet> intersection(
       PermissionSet::CreateIntersection(permissions.get(), required));
   if (!intersection->IsEmpty()) {
     error_ = kCantRemoveRequiredPermissionsError;
@@ skipping 45 matching lines @@
   }
 
   scoped_ptr<Request::Params> params(Request::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   requested_permissions_ =
       helpers::UnpackPermissionSet(params->permissions, &error_);
   if (!requested_permissions_.get())
     return false;
 
-  PermissionsInfo* info = PermissionsInfo::GetInstance();
   extensions::ExtensionPrefs* prefs =
       profile()->GetExtensionService()->extension_prefs();
 
   // Make sure they're only requesting permissions supported by this API.
   APIPermissionSet apis = requested_permissions_->apis();
   for (APIPermissionSet::const_iterator i = apis.begin();
        i != apis.end(); ++i) {
-    const APIPermission* api = info->GetByID(*i);
-    if (!api->supports_optional()) {
+    if (!i->permission()->supports_optional()) {
       error_ = ExtensionErrorUtils::FormatErrorMessage(
-          kNotWhitelistedError, api->name());
+          kNotWhitelistedError, i->name());
       return false;
     }
   }
 
   // The requested permissions must be defined as optional in the manifest.
   if (!GetExtension()->optional_permission_set()->Contains(
           *requested_permissions_)) {
     error_ = kNotInOptionalPermissionsError;
     results_ = Request::Results::Create(false);
     return false;
@@ skipping 14 matching lines @@
   // Filter out the granted permissions so we only prompt for new ones.
   requested_permissions_ = PermissionSet::CreateDifference(
       requested_permissions_.get(), granted.get());
 
   AddRef();  // Balanced in InstallUIProceed() / InstallUIAbort().
 
   // We don't need to show the prompt if there are no new warnings, or if
   // we're skipping the confirmation UI. All extension types but INTERNAL
   // are allowed to silently increase their permission level.
   bool has_no_warnings = requested_permissions_->GetWarningMessages(
-      GetExtension()->GetType()).size() == 0;
+      GetExtension()->GetType()).empty();
   if (auto_confirm_for_tests == PROCEED || has_no_warnings) {
     InstallUIProceed();
   } else if (auto_confirm_for_tests == ABORT) {
     // Pretend the user clicked cancel.
     InstallUIAbort(true);
   } else {
     CHECK_EQ(DO_NOT_SKIP, auto_confirm_for_tests);
     install_ui_.reset(
         chrome::CreateExtensionInstallPromptWithBrowser(GetCurrentBrowser()));
     install_ui_->ConfirmPermissions(
         this, GetExtension(), requested_permissions_.get());
   }
 
   return true;
 }