Reland r50834

TBR=tony@chromium.org

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

1 files changed, 9 insertions, 11 deletions

diff --git a/chrome/common/extensions/extension_extent.h b/chrome/common/extensions/extension_extent.h
index 187303d..df8d02d 100644
--- a/chrome/common/extensions/extension_extent.h
+++ b/chrome/common/extensions/extension_extent.h
@@ -8,27 +8,25 @@
 #include <string>
 #include <vector>
 
+#include "chrome/common/extensions/url_pattern.h"
 #include "googleurl/src/gurl.h"
 
 // Represents the set of URLs an extension uses for web content.
 class ExtensionExtent {
  public:
-  const std::vector<std::string>& paths() const { return paths_; }
-  void add_path(const std::string& val) { paths_.push_back(val); }
-  void clear_paths() { paths_.clear(); }
+  typedef std::vector<URLPattern> PatternList;
 
-  const GURL& origin() const { return origin_; }
-  void set_origin(const GURL& val) { origin_ = val; }
+  bool is_empty() const { return patterns_.empty(); }
+
+  const PatternList& patterns() const { return patterns_; }
+  void AddPattern(const URLPattern& pattern) { patterns_.push_back(pattern); }
+  void ClearPaths() { patterns_.clear(); }
 
   bool ContainsURL(const GURL& url) const;
 
  private:
-  // The security origin (scheme+host+port) of the extent.
-  GURL origin_;
-
-  // A set of path prefixes that further restrict the set of valid URLs below
-  // origin_. This may be empty.
-  std::vector<std::string> paths_;
+  // The list of URL patterns that comprise the extent.
+  PatternList patterns_;
 };
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_EXTENT_H_