[Extensions] Un-refcount PermissionSet

chrome/browser/extensions/permissions_updater.h

Index: chrome/browser/extensions/permissions_updater.h
diff --git a/chrome/browser/extensions/permissions_updater.h b/chrome/browser/extensions/permissions_updater.h
index aab225a952f4139fcce5878d276e69575dd5a0eb..c7b162821b58bc94e5e06882d3245381dbfc2767 100644
--- a/chrome/browser/extensions/permissions_updater.h
+++ b/chrome/browser/extensions/permissions_updater.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "extensions/browser/extension_event_histogram_value.h"
 
 namespace base {
@@ -69,7 +69,7 @@ class PermissionsUpdater {
                                const PermissionSet* permissions);
 
   // Returns the set of revokable permissions.
-  scoped_refptr<const PermissionSet> GetRevokablePermissions(
+  scoped_ptr<const PermissionSet> GetRevokablePermissions(
       const Extension* extension) const;
 
   // Adds all permissions in the |extension|'s active permissions to its
@@ -98,14 +98,14 @@ class PermissionsUpdater {
   // withheld permissions to |withheld|. Otherwise, |withheld| permissions are
   // not changed.
   void SetPermissions(const Extension* extension,
-                      const scoped_refptr<const PermissionSet>& active,
-                      scoped_refptr<const PermissionSet> withheld);
+                      scoped_ptr<const PermissionSet> active,
+                      scoped_ptr<const PermissionSet> withheld);
 
   // Dispatches specified event to the extension.
   void DispatchEvent(const std::string& extension_id,
                      events::HistogramValue histogram_value,
                      const char* event_name,
-                     const PermissionSet* changed_permissions);
+                     const PermissionSet& changed_permissions);
 
   // Issues the relevant events, messages and notifications when the
   // |extension|'s permissions have |changed| (|changed| is the delta).
@@ -114,7 +114,7 @@ class PermissionsUpdater {
   // onAdded/onRemoved events in the extension.
   void NotifyPermissionsUpdated(EventType event_type,
                                 const Extension* extension,
-                                const PermissionSet* changed);
+                                const PermissionSet& changed);
 
   // The associated BrowserContext.
   content::BrowserContext* browser_context_;
@@ -122,6 +122,8 @@ class PermissionsUpdater {
   // Initialization flag that determines whether prefs is consulted about the
   // extension. Transient extensions should not have entries in prefs.
   InitFlag init_flag_;
+
+  DISALLOW_COPY_AND_ASSIGN(PermissionsUpdater);
 };
 
 }  // namespace extensions