[Extensions] Un-refcount PermissionSet

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/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h"
 #include "chrome/browser/extensions/extension_management.h"
@@ skipping 38 matching lines @@
 };
 AutoConfirmForTest auto_confirm_for_tests = DO_NOT_SKIP;
 bool ignore_user_gesture_for_tests = false;
 
 }  // namespace
 
 bool PermissionsContainsFunction::RunSync() {
   scoped_ptr<Contains::Params> params(Contains::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
-  scoped_refptr<const PermissionSet> permissions = helpers::UnpackPermissionSet(
+  scoped_ptr<const PermissionSet> permissions = helpers::UnpackPermissionSet(
       params->permissions,
       ExtensionPrefs::Get(GetProfile())->AllowFileAccess(extension_->id()),
       &error_);
   if (!permissions.get())
     return false;
 
   results_ = Contains::Results::Create(
       extension()->permissions_data()->active_permissions()->Contains(
-          *permissions.get()));
+          *permissions));
   return true;
 }
 
 bool PermissionsGetAllFunction::RunSync() {
   scoped_ptr<Permissions> permissions = helpers::PackPermissionSet(
-      extension()->permissions_data()->active_permissions().get());
+      extension()->permissions_data()->active_permissions());
   results_ = GetAll::Results::Create(*permissions);
   return true;
 }
 
 bool PermissionsRemoveFunction::RunSync() {
   scoped_ptr<Remove::Params> params(Remove::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
-  scoped_refptr<const PermissionSet> permissions = helpers::UnpackPermissionSet(
+  scoped_ptr<const PermissionSet> permissions = helpers::UnpackPermissionSet(
       params->permissions,
       ExtensionPrefs::Get(GetProfile())->AllowFileAccess(extension_->id()),
       &error_);
   if (!permissions.get())
     return false;
 
   // 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) {
     if (!i->info()->supports_optional()) {
       error_ = ErrorUtils::FormatErrorMessage(
           kNotWhitelistedError, i->name());
       return false;
     }
   }
 
   // Make sure we only remove optional permissions, and not required
   // permissions. Sadly, for some reason we support having a permission be both
   // optional and required (and should assume its required), so we need both of
   // these checks.
   // TODO(devlin): *Why* do we support that? Should be a load error.
-  scoped_refptr<const PermissionSet> optional =
+  const PermissionSet* optional =
       PermissionsParser::GetOptionalPermissions(extension());
-  scoped_refptr<const PermissionSet> required =
+  const PermissionSet* required =
       PermissionsParser::GetRequiredPermissions(extension());
   if (!optional->Contains(*permissions) ||
-      !scoped_refptr<const PermissionSet>(
+      !scoped_ptr<const PermissionSet>(
            PermissionSet::CreateIntersection(*permissions, *required))
            ->IsEmpty()) {
     error_ = kCantRemoveRequiredPermissionsError;
     return false;
   }
 
   // Only try and remove those permissions that are active on the extension.
   // For backwards compatability with behavior before this check was added, just
   // silently remove any that aren't present.
   permissions = PermissionSet::CreateIntersection(
@@ skipping 63 matching lines @@
        i != apis.end(); ++i) {
     if (!i->info()->supports_optional()) {
       error_ = ErrorUtils::FormatErrorMessage(
           kNotWhitelistedError, i->name());
       return false;
     }
   }
 
   // The requested permissions must be defined as optional in the manifest.
   if (!PermissionsParser::GetOptionalPermissions(extension())
-           ->Contains(*requested_permissions_.get())) {
+           ->Contains(*requested_permissions_)) {
     error_ = kNotInOptionalPermissionsError;
     return false;
   }
 
   // Automatically declines api permissions requests, which are blocked by
   // enterprise policy.
   if (!ExtensionManagementFactory::GetForBrowserContext(GetProfile())
-           ->IsPermissionSetAllowed(extension(), requested_permissions_)) {
+           ->IsPermissionSetAllowed(extension(), *requested_permissions_)) {
     error_ = kBlockedByEnterprisePolicy;
     return false;
   }
 
   // We don't need to prompt the user if the requested permissions are a subset
   // of the granted permissions set.
-  scoped_refptr<const PermissionSet> granted =
+  scoped_ptr<const PermissionSet> granted =
       ExtensionPrefs::Get(GetProfile())
           ->GetGrantedPermissions(extension()->id());
-  if (granted.get() && granted->Contains(*requested_permissions_.get())) {
+  if (granted.get() && granted->Contains(*requested_permissions_)) {
     PermissionsUpdater perms_updater(GetProfile());
     perms_updater.AddPermissions(extension(), requested_permissions_.get());
     results_ = Request::Results::Create(true);
     SendResponse(true);
     return true;
   }
 
   // Filter out the granted permissions so we only prompt for new ones.
   requested_permissions_ =
       PermissionSet::CreateDifference(*requested_permissions_, *granted);
 
   // Filter out the active permissions.
   requested_permissions_ = PermissionSet::CreateDifference(
-      *requested_permissions_.get(),
+      *requested_permissions_,
       *extension()->permissions_data()->active_permissions());
 
   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.
   const PermissionMessageProvider* message_provider =
       PermissionMessageProvider::Get();
   bool has_no_warnings =
       message_provider->GetPermissionMessages(
                             message_provider->GetAllPermissionIDs(
                                 requested_permissions_.get(),
                                 extension()->GetType())).empty();
   if (auto_confirm_for_tests == PROCEED || has_no_warnings ||
       extension_->location() == Manifest::COMPONENT) {
     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(new ExtensionInstallPrompt(GetAssociatedWebContents()));
-    install_ui_->ConfirmPermissions(
-        this, extension(), requested_permissions_.get());
+    install_ui_->ConfirmPermissions(this, extension(),
+                                    requested_permissions_->Clone());
   }
 
   return true;
 }
 
 }  // namespace extensions