| Index: chrome/common/extensions/permissions/permission_set.cc
|
| diff --git a/chrome/common/extensions/permissions/permission_set.cc b/chrome/common/extensions/permissions/permission_set.cc
|
| index 0f572ee5c38638f48bce2d29339a5558021ddf39..b8d2ee60ac3a5066dc2189867386bf2c7dcc4ea5 100644
|
| --- a/chrome/common/extensions/permissions/permission_set.cc
|
| +++ b/chrome/common/extensions/permissions/permission_set.cc
|
| @@ -224,20 +224,9 @@ bool PermissionSet::operator==(
|
| }
|
|
|
| bool PermissionSet::Contains(const PermissionSet& set) const {
|
| - // Every set includes the empty set.
|
| - if (set.IsEmpty())
|
| - return true;
|
| -
|
| - if (!apis_.Contains(set.apis()))
|
| - return false;
|
| -
|
| - if (!explicit_hosts().Contains(set.explicit_hosts()))
|
| - return false;
|
| -
|
| - if (!scriptable_hosts().Contains(set.scriptable_hosts()))
|
| - return false;
|
| -
|
| - return true;
|
| + return apis_.Contains(set.apis()) &&
|
| + explicit_hosts().Contains(set.explicit_hosts()) &&
|
| + scriptable_hosts().Contains(set.scriptable_hosts());
|
| }
|
|
|
| std::set<std::string> PermissionSet::GetAPIsAsStrings() const {
|
|
|