[Extensions] Un-refcount PermissionSet

extensions/browser/extension_prefs.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/extension_prefs.h"
 
 #include <iterator>
 
 #include "base/metrics/histogram_macros.h"
 #include "base/prefs/pref_service.h"
@@ skipping 538 matching lines @@
   UpdateExtensionPref(extension_id, pref_key, new_value.ToValue().release());
 }
 
 bool ExtensionPrefs::ReadPrefAsBooleanAndReturn(
     const std::string& extension_id,
     const std::string& pref_key) const {
   bool out_value = false;
   return ReadPrefAsBoolean(extension_id, pref_key, &out_value) && out_value;
 }
 
-scoped_refptr<const PermissionSet> ExtensionPrefs::ReadPrefAsPermissionSet(
+scoped_ptr<const PermissionSet> ExtensionPrefs::ReadPrefAsPermissionSet(
     const std::string& extension_id,
     const std::string& pref_key) const {
   if (!GetExtensionPref(extension_id))
     return nullptr;
 
   // Retrieve the API permissions. Please refer SetExtensionPrefPermissionSet()
   // for api_values format.
   APIPermissionSet apis;
   const base::ListValue* api_values = NULL;
   std::string api_pref = JoinPrefs(pref_key, kPrefAPIs);
@@ skipping 20 matching lines @@
   ReadPrefAsURLPatternSet(
       extension_id, JoinPrefs(pref_key, kPrefExplicitHosts),
       &explicit_hosts, Extension::kValidHostPermissionSchemes);
 
   // Retrieve the scriptable host permissions.
   URLPatternSet scriptable_hosts;
   ReadPrefAsURLPatternSet(
       extension_id, JoinPrefs(pref_key, kPrefScriptableHosts),
       &scriptable_hosts, UserScript::ValidUserScriptSchemes());
 
-  return make_scoped_refptr(new PermissionSet(
-      apis, manifest_permissions, explicit_hosts, scriptable_hosts));
+  return make_scoped_ptr(new PermissionSet(apis, manifest_permissions,
+                                           explicit_hosts, scriptable_hosts));
 }
 
 // Set the API or Manifest permissions.
 // The format of api_values is:
 // [ "permission_name1",   // permissions do not support detail.
 //   "permission_name2",
 //   {"permission_name3": value },
 //   // permission supports detail, permission detail will be stored in value.
 //   ...
 // ]
@@ skipping 395 matching lines @@
       }
 
       UpdateExtensionPref(*ext_id, kPrefDisableReasons,
                           new base::FundamentalValue(new_value));
       // Remove the old disable reason.
       UpdateExtensionPref(*ext_id, kDeprecatedPrefDisableReason, NULL);
     }
   }
 }
 
-scoped_refptr<const PermissionSet> ExtensionPrefs::GetGrantedPermissions(
+scoped_ptr<const PermissionSet> ExtensionPrefs::GetGrantedPermissions(
     const std::string& extension_id) const {
   CHECK(crx_file::id_util::IdIsValid(extension_id));
   return ReadPrefAsPermissionSet(extension_id, kPrefGrantedPermissions);
 }
 
 void ExtensionPrefs::AddGrantedPermissions(
     const std::string& extension_id,
     const PermissionSet* permissions) {
   CHECK(crx_file::id_util::IdIsValid(extension_id));
   DCHECK(permissions);
 
-  scoped_refptr<const PermissionSet> granted =
-      GetGrantedPermissions(extension_id);
-  granted = granted.get() ? PermissionSet::CreateUnion(*permissions, *granted)
-                          : permissions;
+  scoped_ptr<const PermissionSet> granted = GetGrantedPermissions(extension_id);
+  scoped_ptr<const PermissionSet> union_set;
+  if (granted)
+    union_set = PermissionSet::CreateUnion(*permissions, *granted);
   // The new granted permissions are the union of the already granted
   // permissions and the newly granted permissions.
   SetExtensionPrefPermissionSet(extension_id, kPrefGrantedPermissions,
-                                granted.get());
+                                union_set ? union_set.get() : permissions);
 }
 
 void ExtensionPrefs::RemoveGrantedPermissions(
     const std::string& extension_id,
     const PermissionSet* permissions) {
   CHECK(crx_file::id_util::IdIsValid(extension_id));
 
   // The new granted permissions are the difference of the already granted
   // permissions and the newly ungranted permissions.
   SetExtensionPrefPermissionSet(
       extension_id, kPrefGrantedPermissions,
       PermissionSet::CreateDifference(*GetGrantedPermissions(extension_id),
                                       *permissions)
           .get());
 }
 
-scoped_refptr<const PermissionSet> ExtensionPrefs::GetActivePermissions(
+scoped_ptr<const PermissionSet> ExtensionPrefs::GetActivePermissions(
     const std::string& extension_id) const {
   CHECK(crx_file::id_util::IdIsValid(extension_id));
   return ReadPrefAsPermissionSet(extension_id, kPrefActivePermissions);
 }
 
 void ExtensionPrefs::SetActivePermissions(
     const std::string& extension_id,
     const PermissionSet* permissions) {
   SetExtensionPrefPermissionSet(
       extension_id, kPrefActivePermissions, permissions);
@@ skipping 1048 matching lines @@
   extension_pref_value_map_->RegisterExtension(
       extension_id, install_time, is_enabled, is_incognito_enabled);
 
   FOR_EACH_OBSERVER(
       ExtensionPrefsObserver,
       observer_list_,
       OnExtensionRegistered(extension_id, install_time, is_enabled));
 }
 
 }  // namespace extensions