summaryrefslogtreecommitdiffstats
path: root/extensions/common/permissions
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2015-12-18 09:48:00 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-18 17:48:52 +0000
commite59eca16010c109a5e3e4922189c8b264d34caa9 (patch)
tree838815399c6364a99a465938df9978aeaf75c766 /extensions/common/permissions
parent5100baf1eac806abbdaaf8002887aacf652f34e5 (diff)
downloadchromium_src-e59eca16010c109a5e3e4922189c8b264d34caa9.zip
chromium_src-e59eca16010c109a5e3e4922189c8b264d34caa9.tar.gz
chromium_src-e59eca16010c109a5e3e4922189c8b264d34caa9.tar.bz2
Convert Pass()→std::move() in //extensions
BUG=557422 Review URL: https://codereview.chromium.org/1537893002 Cr-Commit-Position: refs/heads/master@{#366120}
Diffstat (limited to 'extensions/common/permissions')
-rw-r--r--extensions/common/permissions/permissions_data.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/extensions/common/permissions/permissions_data.cc b/extensions/common/permissions/permissions_data.cc
index 79271d7..5b28d85 100644
--- a/extensions/common/permissions/permissions_data.cc
+++ b/extensions/common/permissions/permissions_data.cc
@@ -4,6 +4,8 @@
#include "extensions/common/permissions/permissions_data.h"
+#include <utility>
+
#include "base/command_line.h"
#include "content/public/common/url_constants.h"
#include "extensions/common/constants.h"
@@ -132,14 +134,14 @@ void PermissionsData::SetPermissions(
scoped_ptr<const PermissionSet> active,
scoped_ptr<const PermissionSet> withheld) const {
AutoLockOnValidThread lock(runtime_lock_, thread_checker_.get());
- active_permissions_unsafe_ = active.Pass();
- withheld_permissions_unsafe_ = withheld.Pass();
+ active_permissions_unsafe_ = std::move(active);
+ withheld_permissions_unsafe_ = std::move(withheld);
}
void PermissionsData::SetActivePermissions(
scoped_ptr<const PermissionSet> active) const {
AutoLockOnValidThread lock(runtime_lock_, thread_checker_.get());
- active_permissions_unsafe_ = active.Pass();
+ active_permissions_unsafe_ = std::move(active);
}
void PermissionsData::UpdateTabSpecificPermissions(
@@ -154,7 +156,7 @@ void PermissionsData::UpdateTabSpecificPermissions(
? static_cast<const PermissionSet&>(PermissionSet())
: *iter->second,
permissions);
- tab_specific_permissions_[tab_id] = new_permissions.Pass();
+ tab_specific_permissions_[tab_id] = std::move(new_permissions);
}
void PermissionsData::ClearTabSpecificPermissions(int tab_id) const {