Skip to content

Commit

Permalink
Use base::STLSet* in place of std::set_* for simplicity.
Browse files Browse the repository at this point in the history
BUG=254066

Review URL: https://codereview.chromium.org/255873003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266842 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
sungmann.cho@navercorp.com committed Apr 29, 2014
1 parent 816f932 commit 97da36b
Showing 1 changed file with 8 additions and 23 deletions.
31 changes: 8 additions & 23 deletions extensions/common/permissions/set_disjunction_permission.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#ifndef EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_
#define EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_

#include <algorithm>
#include <set>
#include <string>

Expand Down Expand Up @@ -52,10 +51,8 @@ class SetDisjunctionPermission : public APIPermission {
CHECK(rhs->info() == info());
const SetDisjunctionPermission* perm =
static_cast<const SetDisjunctionPermission*>(rhs);
return std::includes(data_set_.begin(),
data_set_.end(),
perm->data_set_.begin(),
perm->data_set_.end());
return base::STLIncludes<std::set<PermissionDataType> >(
data_set_, perm->data_set_);
}

virtual bool Equal(const APIPermission* rhs) const OVERRIDE {
Expand All @@ -76,12 +73,8 @@ class SetDisjunctionPermission : public APIPermission {
const SetDisjunctionPermission* perm =
static_cast<const SetDisjunctionPermission*>(rhs);
scoped_ptr<SetDisjunctionPermission> result(new DerivedType(info()));
std::set_difference(data_set_.begin(),
data_set_.end(),
perm->data_set_.begin(),
perm->data_set_.end(),
std::inserter<std::set<PermissionDataType> >(
result->data_set_, result->data_set_.begin()));
result->data_set_ = base::STLSetDifference<std::set<PermissionDataType> >(
data_set_, perm->data_set_);
return result->data_set_.empty() ? NULL : result.release();
}

Expand All @@ -90,12 +83,8 @@ class SetDisjunctionPermission : public APIPermission {
const SetDisjunctionPermission* perm =
static_cast<const SetDisjunctionPermission*>(rhs);
scoped_ptr<SetDisjunctionPermission> result(new DerivedType(info()));
std::set_union(data_set_.begin(),
data_set_.end(),
perm->data_set_.begin(),
perm->data_set_.end(),
std::inserter<std::set<PermissionDataType> >(
result->data_set_, result->data_set_.begin()));
result->data_set_ = base::STLSetUnion<std::set<PermissionDataType> >(
data_set_, perm->data_set_);
return result.release();
}

Expand All @@ -104,12 +93,8 @@ class SetDisjunctionPermission : public APIPermission {
const SetDisjunctionPermission* perm =
static_cast<const SetDisjunctionPermission*>(rhs);
scoped_ptr<SetDisjunctionPermission> result(new DerivedType(info()));
std::set_intersection(data_set_.begin(),
data_set_.end(),
perm->data_set_.begin(),
perm->data_set_.end(),
std::inserter<std::set<PermissionDataType> >(
result->data_set_, result->data_set_.begin()));
result->data_set_ = base::STLSetIntersection<std::set<PermissionDataType> >(
data_set_, perm->data_set_);
return result->data_set_.empty() ? NULL : result.release();
}

Expand Down

0 comments on commit 97da36b

Please sign in to comment.