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

Unified Diff: extensions/common/permissions/permissions_data.cc

Issue 1908953003: Convert //extensions/{common,shell} from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? Created 4 years, 8 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/common/permissions/permissions_data.cc
diff --git a/extensions/common/permissions/permissions_data.cc b/extensions/common/permissions/permissions_data.cc
index c77c4ee511b57bca4ff8bc27928e5938da019bc2..4025d23c0ff0096e075b60521ae95bb0b0e5675c 100644
--- a/extensions/common/permissions/permissions_data.cc
+++ b/extensions/common/permissions/permissions_data.cc
@@ -133,15 +133,15 @@ void PermissionsData::BindToCurrentThread() const {
}
void PermissionsData::SetPermissions(
- scoped_ptr<const PermissionSet> active,
- scoped_ptr<const PermissionSet> withheld) const {
+ std::unique_ptr<const PermissionSet> active,
+ std::unique_ptr<const PermissionSet> withheld) const {
AutoLockOnValidThread lock(runtime_lock_, thread_checker_.get());
active_permissions_unsafe_ = std::move(active);
withheld_permissions_unsafe_ = std::move(withheld);
}
void PermissionsData::SetActivePermissions(
- scoped_ptr<const PermissionSet> active) const {
+ std::unique_ptr<const PermissionSet> active) const {
AutoLockOnValidThread lock(runtime_lock_, thread_checker_.get());
active_permissions_unsafe_ = std::move(active);
}
@@ -153,11 +153,12 @@ void PermissionsData::UpdateTabSpecificPermissions(
CHECK_GE(tab_id, 0);
TabPermissionsMap::const_iterator iter =
tab_specific_permissions_.find(tab_id);
- scoped_ptr<const PermissionSet> new_permissions = PermissionSet::CreateUnion(
- iter == tab_specific_permissions_.end()
- ? static_cast<const PermissionSet&>(PermissionSet())
- : *iter->second,
- permissions);
+ std::unique_ptr<const PermissionSet> new_permissions =
+ PermissionSet::CreateUnion(
+ iter == tab_specific_permissions_.end()
+ ? static_cast<const PermissionSet&>(PermissionSet())
+ : *iter->second,
+ permissions);
tab_specific_permissions_[tab_id] = std::move(new_permissions);
}
« no previous file with comments | « extensions/common/permissions/permissions_data.h ('k') | extensions/common/permissions/set_disjunction_permission.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698