Support requesting subsets of host permissions using the permissions API.

BUG=158004
TBR=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/12209094

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182287 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 3 deletions

diff --git a/extensions/common/url_pattern_set.cc b/extensions/common/url_pattern_set.cc
index 4066320..7a19c71 100644
--- a/extensions/common/url_pattern_set.cc
+++ b/extensions/common/url_pattern_set.cc
@@ -129,9 +129,14 @@ void URLPatternSet::ClearPatterns() {
   patterns_.clear();
 }
 
-bool URLPatternSet::Contains(const URLPatternSet& set) const {
-  return std::includes(patterns_.begin(), patterns_.end(),
-                       set.patterns_.begin(), set.patterns_.end());
+bool URLPatternSet::Contains(const URLPatternSet& other) const {
+  for (URLPatternSet::const_iterator it = other.begin();
+       it != other.end(); ++it) {
+    if (!ContainsPattern(*it))
+      return false;
+  }
+
+  return true;
 }
 
 bool URLPatternSet::MatchesURL(const GURL& url) const {
@@ -216,4 +221,13 @@ bool URLPatternSet::Populate(const base::ListValue& value,
   return Populate(patterns, valid_schemes, allow_file_access, error);
 }
 
+bool URLPatternSet::ContainsPattern(const URLPattern& pattern) const {
+  for (URLPatternSet::const_iterator it = begin();
+       it != end(); ++it) {
+    if (it->Contains(pattern))
+      return true;
+  }
+  return false;
+}
+
 }  // namespace extensions