[Extensions] Un-refcount PermissionSet

extensions/common/manifest_handlers/permissions_parser.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/common/manifest_handlers/permissions_parser.h"
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 14 matching lines @@
 #include "url/url_constants.h"
 
 namespace extensions {
 
 namespace {
 
 namespace keys = manifest_keys;
 namespace errors = manifest_errors;
 
 struct ManifestPermissions : public Extension::ManifestData {
-  ManifestPermissions(scoped_refptr<const PermissionSet> permissions);
+  ManifestPermissions(scoped_ptr<const PermissionSet> permissions);
   ~ManifestPermissions() override;
 
-  scoped_refptr<const PermissionSet> permissions;
+  scoped_ptr<const PermissionSet> permissions;
 };
 
 ManifestPermissions::ManifestPermissions(
-    scoped_refptr<const PermissionSet> permissions)
-    : permissions(permissions) {
-}
+    scoped_ptr<const PermissionSet> permissions)
+    : permissions(permissions.Pass()) {}
 
 ManifestPermissions::~ManifestPermissions() {
 }
 
 // Checks whether the host |pattern| is allowed for the given |extension|,
 // given API permissions |permissions|.
 bool CanSpecifyHostPermission(const Extension* extension,
                               const URLPattern& pattern,
                               const APIPermissionSet& permissions) {
   if (!pattern.match_all_urls() &&
@@ skipping 205 matching lines @@
     return false;
   }
 
   return true;
 }
 
 void PermissionsParser::Finalize(Extension* extension) {
   ManifestHandler::AddExtensionInitialRequiredPermissions(
       extension, &initial_required_permissions_->manifest_permissions);
 
-  scoped_refptr<const PermissionSet> required_permissions(
+  scoped_ptr<const PermissionSet> required_permissions(
       new PermissionSet(initial_required_permissions_->api_permissions,
                         initial_required_permissions_->manifest_permissions,
                         initial_required_permissions_->host_permissions,
                         initial_required_permissions_->scriptable_hosts));
-  extension->SetManifestData(keys::kPermissions,
-                             new ManifestPermissions(required_permissions));
+  extension->SetManifestData(
+      keys::kPermissions, new ManifestPermissions(required_permissions.Pass()));
 
-  scoped_refptr<const PermissionSet> optional_permissions(
-      new PermissionSet(initial_optional_permissions_->api_permissions,
-                        initial_optional_permissions_->manifest_permissions,
-                        initial_optional_permissions_->host_permissions,
-                        URLPatternSet()));
-  extension->SetManifestData(keys::kOptionalPermissions,
-                             new ManifestPermissions(optional_permissions));
+  scoped_ptr<const PermissionSet> optional_permissions(new PermissionSet(
+      initial_optional_permissions_->api_permissions,
+      initial_optional_permissions_->manifest_permissions,
+      initial_optional_permissions_->host_permissions, URLPatternSet()));
+  extension->SetManifestData(
+      keys::kOptionalPermissions,
+      new ManifestPermissions(optional_permissions.Pass()));
 }
 
 // static
 void PermissionsParser::AddAPIPermission(Extension* extension,
                                          APIPermission::ID permission) {
   DCHECK(extension->permissions_parser());
   extension->permissions_parser()
       ->initial_required_permissions_->api_permissions.insert(permission);
 }
 
@@ skipping 17 matching lines @@
 // static
 void PermissionsParser::SetScriptableHosts(
     Extension* extension,
     const URLPatternSet& scriptable_hosts) {
   DCHECK(extension->permissions_parser());
   extension->permissions_parser()
       ->initial_required_permissions_->scriptable_hosts = scriptable_hosts;
 }
 
 // static
-scoped_refptr<const PermissionSet> PermissionsParser::GetRequiredPermissions(
+const PermissionSet* PermissionsParser::GetRequiredPermissions(
     const Extension* extension) {
   DCHECK(extension->GetManifestData(keys::kPermissions));
   return static_cast<const ManifestPermissions*>(
-             extension->GetManifestData(keys::kPermissions))->permissions;
+             extension->GetManifestData(keys::kPermissions))
+      ->permissions.get();
 }
 
 // static
-scoped_refptr<const PermissionSet> PermissionsParser::GetOptionalPermissions(
+const PermissionSet* PermissionsParser::GetOptionalPermissions(
     const Extension* extension) {
   DCHECK(extension->GetManifestData(keys::kOptionalPermissions));
   return static_cast<const ManifestPermissions*>(
              extension->GetManifestData(keys::kOptionalPermissions))
-      ->permissions;
+      ->permissions.get();
 }
 
 }  // namespace extensions