Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3238)

Unified Diff: extensions/renderer/dispatcher.cc

Issue 1349613003: [Extensions] Un-refcount PermissionSet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/renderer/dispatcher.cc
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
index c9dfb9c9593e21268da4f44b7145163d94257c13..65e5a87c9b5638ec1638219c9884d0057d857bd7 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -1137,9 +1137,9 @@ void Dispatcher::OnUpdatePermissions(
if (!extension)
return;
- scoped_refptr<const PermissionSet> active =
+ scoped_ptr<const PermissionSet> active =
params.active_permissions.ToPermissionSet();
- scoped_refptr<const PermissionSet> withheld =
+ scoped_ptr<const PermissionSet> withheld =
params.withheld_permissions.ToPermissionSet();
if (is_webkit_initialized_) {
@@ -1149,7 +1149,7 @@ void Dispatcher::OnUpdatePermissions(
active->effective_hosts());
}
- extension->permissions_data()->SetPermissions(active, withheld);
+ extension->permissions_data()->SetPermissions(active.Pass(), withheld.Pass());
UpdateBindings(extension->id());
}
@@ -1167,10 +1167,9 @@ void Dispatcher::OnUpdateTabSpecificPermissions(const GURL& visible_url,
extension->permissions_data()->GetEffectiveHostPermissions();
extension->permissions_data()->UpdateTabSpecificPermissions(
tab_id,
- new extensions::PermissionSet(extensions::APIPermissionSet(),
- extensions::ManifestPermissionSet(),
- new_hosts,
- extensions::URLPatternSet()));
+ extensions::PermissionSet(extensions::APIPermissionSet(),
+ extensions::ManifestPermissionSet(), new_hosts,
+ extensions::URLPatternSet()));
if (is_webkit_initialized_ && update_origin_whitelist) {
UpdateOriginPermissions(

Powered by Google App Engine
This is Rietveld 408576698