Support requesting subsets of host permissions using the permissions API.

chrome/common/extensions/permissions/permission_set.cc

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..51ad2c19852994740d533daa963e1d928858f2b5 100644
--- a/chrome/common/extensions/permissions/permission_set.cc
+++ b/chrome/common/extensions/permissions/permission_set.cc
@@ -224,20 +224,15 @@ 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 apis_.Contains(set.apis()) &&
+         explicit_hosts().Contains(set.explicit_hosts()) &&
+         scriptable_hosts().Contains(set.scriptable_hosts());
+}
 
-  return true;
+bool PermissionSet::ContainsOrEncompasses(const PermissionSet& set) const {
+  return apis_.Contains(set.apis()) &&
+         explicit_hosts().Encompasses(set.explicit_hosts()) &&
+         scriptable_hosts().Encompasses(set.scriptable_hosts());
 }
 
 std::set<std::string> PermissionSet::GetAPIsAsStrings() const {