Rename ExtensionExtent to URLPatternSet and use URLPatternSet instead of std::vector<URLPattern>

 - Rename ExtensionExtent to URLPatternSet
 - Refactor common/extensions/user_script.h, common/extensions/user_script.cc, common/extensions/file_browser_handler.h and common/extensions/file_browser_handler.cc so that they use URLPatternSet instead of std::vector<URLPattern>
 - At many places rename std::vector<URLPattern> to URLPatternList, which is typedefed at common/extensions/url_pattern.h
 - Rename URLPatternSet::ClearPaths() to URLPatternSet::ClearPatterns()
 - Rename URLPatternSet::ContainsURL() to URLPatternSet::MatchesUrl()

BUG=72955
TEST=ExtensionManifestTest.FileBrowserHandlers, ExtensionUserScriptTest.*, ExtensionURLPatternTest.*

Review URL: http://codereview.chromium.org/7038029
Patch from Kentaro Hara <haraken@google.com>.

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

22 files changed, 72 insertions, 72 deletions

diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 8a72b7a..de24524 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -89,8 +89,8 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_extent.h"
 #include "chrome/common/extensions/url_pattern.h"
+#include "chrome/common/extensions/url_pattern_set.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
index 902f070..6931b38 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -281,8 +281,7 @@ bool CrxInstaller::AllowInstall(const Extension* extension,
       pattern.set_host(original_url_.host());
       pattern.set_match_subdomains(true);
 
-      ExtensionExtent::PatternList patterns =
-          extension_->web_extent().patterns();
+      URLPatternList patterns = extension_->web_extent().patterns();
       for (size_t i = 0; i < patterns.size(); ++i) {
         if (!pattern.MatchesHost(patterns[i].host())) {
           *error = base::StringPrintf(
diff --git a/chrome/browser/extensions/extension_context_menu_api.cc b/chrome/browser/extensions/extension_context_menu_api.cc
index a9419c7..50d08b7 100644
--- a/chrome/browser/extensions/extension_context_menu_api.cc
+++ b/chrome/browser/extensions/extension_context_menu_api.cc
@@ -128,7 +128,7 @@ bool ExtensionContextMenuFunction::ParseChecked(
 bool ExtensionContextMenuFunction::ParseURLPatterns(
     const DictionaryValue& properties,
     const char* key,
-    ExtensionExtent* result) {
+    URLPatternSet* result) {
   if (!properties.HasKey(key))
     return true;
   ListValue* list = NULL;
@@ -157,7 +157,7 @@ bool ExtensionContextMenuFunction::SetURLPatterns(
     const DictionaryValue& properties,
     ExtensionMenuItem* item) {
   // Process the documentUrlPattern value.
-  ExtensionExtent document_url_patterns;
+  URLPatternSet document_url_patterns;
   if (!ParseURLPatterns(properties, kDocumentUrlPatternsKey,
                         &document_url_patterns))
     return false;
@@ -167,7 +167,7 @@ bool ExtensionContextMenuFunction::SetURLPatterns(
   }
 
   // Process the targetUrlPattern value.
-  ExtensionExtent target_url_patterns;
+  URLPatternSet target_url_patterns;
   if (!ParseURLPatterns(properties, kTargetUrlPatternsKey,
                         &target_url_patterns))
     return false;
diff --git a/chrome/browser/extensions/extension_context_menu_api.h b/chrome/browser/extensions/extension_context_menu_api.h
index 4ac5670..5562bc7 100644
--- a/chrome/browser/extensions/extension_context_menu_api.h
+++ b/chrome/browser/extensions/extension_context_menu_api.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,7 +8,7 @@
 
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/extensions/extension_menu_manager.h"
-#include "chrome/common/extensions/extension_extent.h"
+#include "chrome/common/extensions/url_pattern_set.h"
 
 class DictionaryValue;
 class ExtensionMenuItem;
@@ -41,7 +41,7 @@ class ExtensionContextMenuFunction : public SyncExtensionFunction {
   // name.
   bool ParseURLPatterns(const DictionaryValue& properties,
                         const char* key,
-                        ExtensionExtent* result);
+                        URLPatternSet* result);
 
   // Reads in any document and targetUrl patterns from |properties| and sets
   // them on |item|.
diff --git a/chrome/browser/extensions/extension_info_map.cc b/chrome/browser/extensions/extension_info_map.cc
index dec04dc..8e8980e 100644
--- a/chrome/browser/extensions/extension_info_map.cc
+++ b/chrome/browser/extensions/extension_info_map.cc
@@ -109,10 +109,10 @@ std::string ExtensionInfoMap::GetDefaultLocaleForExtension(
   return result;
 }
 
-ExtensionExtent ExtensionInfoMap::GetEffectiveHostPermissionsForExtension(
+URLPatternSet ExtensionInfoMap::GetEffectiveHostPermissionsForExtension(
     const std::string& id) const {
   Map::const_iterator iter = extension_info_.find(id);
-  ExtensionExtent result;
+  URLPatternSet result;
   if (iter != extension_info_.end())
     result = iter->second->GetEffectiveHostPermissions();
 
@@ -132,7 +132,7 @@ bool ExtensionInfoMap::CheckURLAccessToExtensionPermission(
     // disallowed, so only one will match.
     info = extension_info_.begin();
     while (info != extension_info_.end() &&
-           !info->second->web_extent().ContainsURL(url))
+           !info->second->web_extent().MatchesURL(url))
       ++info;
   }
 
diff --git a/chrome/browser/extensions/extension_info_map.h b/chrome/browser/extensions/extension_info_map.h
index b657515..5d335c0 100644
--- a/chrome/browser/extensions/extension_info_map.h
+++ b/chrome/browser/extensions/extension_info_map.h
@@ -13,7 +13,7 @@
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_extent.h"
+#include "chrome/common/extensions/url_pattern_set.h"
 #include "googleurl/src/gurl.h"
 
 class Extension;
@@ -61,7 +61,7 @@ class ExtensionInfoMap : public base::RefCountedThreadSafe<ExtensionInfoMap> {
   std::string GetDefaultLocaleForExtension(const std::string& id) const;
 
   // Gets the effective host permissions for the extension with |id|.
-  ExtensionExtent
+  URLPatternSet
       GetEffectiveHostPermissionsForExtension(const std::string& id) const;
 
   // Determine whether a URL has access to the specified extension permission.
diff --git a/chrome/browser/extensions/extension_info_map_unittest.cc b/chrome/browser/extensions/extension_info_map_unittest.cc
index 0eb6357..659b085 100644
--- a/chrome/browser/extensions/extension_info_map_unittest.cc
+++ b/chrome/browser/extensions/extension_info_map_unittest.cc
@@ -134,7 +134,7 @@ TEST_F(ExtensionInfoMapTest, CheckPermissions) {
 
   GURL app_url("http://www.google.com/mail/foo.html");
   ASSERT_TRUE(app->is_app());
-  ASSERT_TRUE(app->web_extent().ContainsURL(app_url));
+  ASSERT_TRUE(app->web_extent().MatchesURL(app_url));
 
   info_map->AddExtension(app);
   info_map->AddExtension(extension);
diff --git a/chrome/browser/extensions/extension_management_api.cc b/chrome/browser/extensions/extension_management_api.cc
index 83a9e43..0053b1d 100644
--- a/chrome/browser/extensions/extension_management_api.cc
+++ b/chrome/browser/extensions/extension_management_api.cc
@@ -107,7 +107,7 @@ static DictionaryValue* CreateExtensionInfo(const Extension& extension,
     // Skip host permissions for hosted apps.
     const URLPatternList host_perms = extension.host_permissions();
     if (!host_perms.empty()) {
-      std::vector<URLPattern>::const_iterator host_perms_iter;
+      URLPatternList::const_iterator host_perms_iter;
       for (host_perms_iter = host_perms.begin();
            host_perms_iter != host_perms.end();
            ++host_perms_iter) {
diff --git a/chrome/browser/extensions/extension_menu_manager.h b/chrome/browser/extensions/extension_menu_manager.h
index e9bb36d..eb87ae7 100644
--- a/chrome/browser/extensions/extension_menu_manager.h
+++ b/chrome/browser/extensions/extension_menu_manager.h
@@ -16,7 +16,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/extensions/extension_icon_manager.h"
-#include "chrome/common/extensions/extension_extent.h"
+#include "chrome/common/extensions/url_pattern_set.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 
@@ -117,10 +117,10 @@ class ExtensionMenuItem {
   ContextList contexts() const { return contexts_; }
   Type type() const { return type_; }
   bool checked() const { return checked_; }
-  const ExtensionExtent& document_url_patterns() const {
+  const URLPatternSet& document_url_patterns() const {
     return document_url_patterns_;
   }
-  const ExtensionExtent& target_url_patterns() const {
+  const URLPatternSet& target_url_patterns() const {
     return target_url_patterns_;
   }
 
@@ -128,10 +128,10 @@ class ExtensionMenuItem {
   void set_title(const std::string& new_title) { title_ = new_title; }
   void set_contexts(ContextList contexts) { contexts_ = contexts; }
   void set_type(Type type) { type_ = type; }
-  void set_document_url_patterns(const ExtensionExtent& patterns) {
+  void set_document_url_patterns(const URLPatternSet& patterns) {
     document_url_patterns_ = patterns;
   }
-  void set_target_url_patterns(const ExtensionExtent& patterns) {
+  void set_target_url_patterns(const URLPatternSet& patterns) {
     target_url_patterns_ = patterns;
   }
 
@@ -178,11 +178,11 @@ class ExtensionMenuItem {
 
   // Patterns for restricting what documents this item will appear for. This
   // applies to the frame where the click took place.
-  ExtensionExtent document_url_patterns_;
+  URLPatternSet document_url_patterns_;
 
   // Patterns for restricting where items appear based on the src/href
   // attribute of IMAGE/AUDIO/VIDEO/LINK tags.
-  ExtensionExtent target_url_patterns_;
+  URLPatternSet target_url_patterns_;
 
   // Any children this item may have.
   List children_;
diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc
index c33511e..af4a262 100644
--- a/chrome/browser/extensions/extension_prefs.cc
+++ b/chrome/browser/extensions/extension_prefs.cc
@@ -239,10 +239,10 @@ static void CleanupBadExtensionKeys(const FilePath& root_dir,
   }
 }
 
-static void ExtentToStringSet(const ExtensionExtent& host_extent,
+static void ExtentToStringSet(const URLPatternSet& host_extent,
                               std::set<std::string>* result) {
-  ExtensionExtent::PatternList patterns = host_extent.patterns();
-  ExtensionExtent::PatternList::const_iterator i;
+  URLPatternList patterns = host_extent.patterns();
+  URLPatternList::const_iterator i;
 
   for (i = patterns.begin(); i != patterns.end(); ++i)
     result->insert(i->GetAsString());
@@ -653,7 +653,7 @@ bool ExtensionPrefs::GetGrantedPermissions(
     const std::string& extension_id,
     bool* full_access,
     std::set<std::string>* api_permissions,
-    ExtensionExtent* host_extent) {
+    URLPatternSet* host_extent) {
   CHECK(Extension::IdIsValid(extension_id));
 
   const DictionaryValue* ext = GetExtensionPref(extension_id);
@@ -698,7 +698,7 @@ void ExtensionPrefs::AddGrantedPermissions(
     const std::string& extension_id,
     const bool full_access,
     const std::set<std::string>& api_permissions,
-    const ExtensionExtent& host_extent) {
+    const URLPatternSet& host_extent) {
   CHECK(Extension::IdIsValid(extension_id));
 
   UpdateExtensionPref(extension_id, kPrefGrantedPermissionsAll,
diff --git a/chrome/browser/extensions/extension_prefs.h b/chrome/browser/extensions/extension_prefs.h
index bb7dd54..034fa62 100644
--- a/chrome/browser/extensions/extension_prefs.h
+++ b/chrome/browser/extensions/extension_prefs.h
@@ -17,6 +17,7 @@
 #include "googleurl/src/gurl.h"
 
 class ExtensionPrefValueMap;
+class URLPatternSet;
 
 // Class for managing global and per-extension preferences.
 //
@@ -180,7 +181,7 @@ class ExtensionPrefs {
   bool GetGrantedPermissions(const std::string& extension_id,
                              bool* full_access,
                              std::set<std::string>* api_permissions,
-                             ExtensionExtent* host_extent);
+                             URLPatternSet* host_extent);
 
   // Adds the specified |api_permissions|, |host_extent| and |full_access|
   // to the granted permissions for extension with |extension_id|.
@@ -189,7 +190,7 @@ class ExtensionPrefs {
   void AddGrantedPermissions(const std::string& extension_id,
                              const bool full_access,
                              const std::set<std::string>& api_permissions,
-                             const ExtensionExtent& host_extent);
+                             const URLPatternSet& host_extent);
 
   // Returns true if the user enabled this extension to be loaded in incognito
   // mode.
diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc
index 6b8e7a9..5b790d1 100644
--- a/chrome/browser/extensions/extension_prefs_unittest.cc
+++ b/chrome/browser/extensions/extension_prefs_unittest.cc
@@ -38,15 +38,15 @@ const char kDefaultPref4[] = "default pref 4";
 
 }  // namespace
 
-static void AddPattern(ExtensionExtent* extent, const std::string& pattern) {
+static void AddPattern(URLPatternSet* extent, const std::string& pattern) {
   int schemes = URLPattern::SCHEME_ALL;
   extent->AddPattern(URLPattern(schemes, pattern));
 }
 
-static void AssertEqualExtents(ExtensionExtent* extent1,
-                               ExtensionExtent* extent2) {
-  std::vector<URLPattern> patterns1 = extent1->patterns();
-  std::vector<URLPattern> patterns2 = extent2->patterns();
+static void AssertEqualExtents(URLPatternSet* extent1,
+                               URLPatternSet* extent2) {
+  URLPatternList patterns1 = extent1->patterns();
+  URLPatternList patterns2 = extent2->patterns();
   std::set<std::string> strings1;
   EXPECT_EQ(patterns1.size(), patterns2.size());
 
@@ -231,8 +231,8 @@ class ExtensionPrefsGrantedPermissions : public ExtensionPrefsTest {
     std::set<std::string> empty_set;
     std::set<std::string> api_perms;
     bool full_access = false;
-    ExtensionExtent host_perms;
-    ExtensionExtent empty_extent;
+    URLPatternSet host_perms;
+    URLPatternSet empty_extent;
 
     // Make sure both granted api and host permissions start empty.
     EXPECT_FALSE(prefs()->GetGrantedPermissions(
@@ -249,7 +249,7 @@ class ExtensionPrefsGrantedPermissions : public ExtensionPrefsTest {
     EXPECT_EQ(api_perm_set1_, api_perms);
     EXPECT_TRUE(host_perms.is_empty());
     EXPECT_FALSE(full_access);
-    host_perms.ClearPaths();
+    host_perms.ClearPatterns();
     api_perms.clear();
 
     // Add part of the host permissions.
@@ -260,7 +260,7 @@ class ExtensionPrefsGrantedPermissions : public ExtensionPrefsTest {
     EXPECT_FALSE(full_access);
     EXPECT_EQ(api_perm_set1_, api_perms);
     AssertEqualExtents(&host_perm_set1_, &host_perms);
-    host_perms.ClearPaths();
+    host_perms.ClearPatterns();
     api_perms.clear();
 
     // Add the rest of both the api and host permissions.
@@ -278,7 +278,7 @@ class ExtensionPrefsGrantedPermissions : public ExtensionPrefsTest {
 
   virtual void Verify() {
     std::set<std::string> api_perms;
-    ExtensionExtent host_perms;
+    URLPatternSet host_perms;
     bool full_access;
 
     EXPECT_TRUE(prefs()->GetGrantedPermissions(
@@ -292,12 +292,12 @@ class ExtensionPrefsGrantedPermissions : public ExtensionPrefsTest {
   std::string extension_id_;
   std::set<std::string> api_perm_set1_;
   std::set<std::string> api_perm_set2_;
-  ExtensionExtent host_perm_set1_;
-  ExtensionExtent host_perm_set2_;
+  URLPatternSet host_perm_set1_;
+  URLPatternSet host_perm_set2_;
 
 
   std::set<std::string> api_permissions_;
-  ExtensionExtent host_permissions_;
+  URLPatternSet host_permissions_;
 };
 TEST_F(ExtensionPrefsGrantedPermissions, GrantedPermissions) {}
 
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index e567d05..d0a9398 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -878,7 +878,7 @@ void ExtensionService::GrantPermissions(const Extension* extension) {
   // We only maintain the granted permissions prefs for INTERNAL extensions.
   CHECK_EQ(Extension::INTERNAL, extension->location());
 
-  ExtensionExtent effective_hosts = extension->GetEffectiveHostPermissions();
+  URLPatternSet effective_hosts = extension->GetEffectiveHostPermissions();
   extension_prefs_->AddGrantedPermissions(extension->id(),
                                           extension->HasFullPermissions(),
                                           extension->api_permissions(),
@@ -1821,7 +1821,7 @@ void ExtensionService::DisableIfPrivilegeIncrease(const Extension* extension) {
                                                   true, true, false);
   bool granted_full_access;
   std::set<std::string> granted_apis;
-  ExtensionExtent granted_extent;
+  URLPatternSet granted_extent;
 
   bool is_extension_upgrade = old != NULL;
   bool is_privilege_increase = false;
@@ -2028,7 +2028,7 @@ const Extension* ExtensionService::GetExtensionByURL(const GURL& url) {
 
 const Extension* ExtensionService::GetExtensionByWebExtent(const GURL& url) {
   for (size_t i = 0; i < extensions_.size(); ++i) {
-    if (extensions_[i]->web_extent().ContainsURL(url))
+    if (extensions_[i]->web_extent().MatchesURL(url))
       return extensions_[i];
   }
   return NULL;
@@ -2045,7 +2045,7 @@ bool ExtensionService::ExtensionBindingsAllowed(const GURL& url) {
 }
 
 const Extension* ExtensionService::GetExtensionByOverlappingWebExtent(
-    const ExtensionExtent& extent) {
+    const URLPatternSet& extent) {
   for (size_t i = 0; i < extensions_.size(); ++i) {
     if (extensions_[i]->web_extent().OverlapsWith(extent))
       return extensions_[i];
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index 66a32c0..2c1587e 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -349,7 +349,7 @@ class ExtensionService
   // Returns an extension that contains any URL that overlaps with the given
   // extent, if one exists.
   const Extension* GetExtensionByOverlappingWebExtent(
-      const ExtensionExtent& extent);
+      const URLPatternSet& extent);
 
   // Returns true if |url| should get extension api bindings and be permitted
   // to make api calls. Note that this is independent of what extension
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 89256c5..5a3ce52 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -109,15 +109,15 @@ static std::vector<std::string> GetErrors() {
   return ret_val;
 }
 
-static void AddPattern(ExtensionExtent* extent, const std::string& pattern) {
+static void AddPattern(URLPatternSet* extent, const std::string& pattern) {
   int schemes = URLPattern::SCHEME_ALL;
   extent->AddPattern(URLPattern(schemes, pattern));
 }
 
-static void AssertEqualExtents(ExtensionExtent* extent1,
-                               ExtensionExtent* extent2) {
-  std::vector<URLPattern> patterns1 = extent1->patterns();
-  std::vector<URLPattern> patterns2 = extent2->patterns();
+static void AssertEqualExtents(URLPatternSet* extent1,
+                               URLPatternSet* extent2) {
+  URLPatternList patterns1 = extent1->patterns();
+  URLPatternList patterns2 = extent2->patterns();
   std::set<std::string> strings1;
   EXPECT_EQ(patterns1.size(), patterns2.size());
 
@@ -1033,7 +1033,7 @@ TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectorySuccess) {
       extension->path().AppendASCII("js_files").AppendASCII("script3.js");
   ASSERT_TRUE(file_util::AbsolutePath(&expected_path));
   EXPECT_TRUE(resource10.ComparePathWithDefault(expected_path));
-  const std::vector<URLPattern> permissions = extension->host_permissions();
+  const URLPatternList permissions = extension->host_permissions();
   ASSERT_EQ(2u, permissions.size());
   EXPECT_EQ("http://*.google.com/*", permissions[0].GetAsString());
   EXPECT_EQ("https://*.google.com/*", permissions[1].GetAsString());
@@ -1374,8 +1374,8 @@ TEST_F(ExtensionServiceTest, GrantedPermissions) {
   std::set<std::string> expected_api_perms;
   std::set<std::string> known_api_perms;
   bool full_access;
-  ExtensionExtent expected_host_perms;
-  ExtensionExtent known_host_perms;
+  URLPatternSet expected_host_perms;
+  URLPatternSet known_host_perms;
 
   // Make sure there aren't any granted permissions before the
   // extension is installed.
@@ -1435,7 +1435,7 @@ TEST_F(ExtensionServiceTest, GrantedFullAccessPermissions) {
 
   bool full_access;
   std::set<std::string> api_permissions;
-  ExtensionExtent host_permissions;
+  URLPatternSet host_permissions;
   EXPECT_TRUE(prefs->GetGrantedPermissions(
       extension_id, &full_access, &api_permissions, &host_permissions));
 
@@ -1467,7 +1467,7 @@ TEST_F(ExtensionServiceTest, GrantedAPIAndHostPermissions) {
   ExtensionPrefs* prefs = service_->extension_prefs();
 
   std::set<std::string> expected_api_permissions;
-  ExtensionExtent expected_host_permissions;
+  URLPatternSet expected_host_permissions;
 
   expected_api_permissions.insert("tabs");
   AddPattern(&expected_host_permissions, "http://*.google.com/*");
@@ -1498,7 +1498,7 @@ TEST_F(ExtensionServiceTest, GrantedAPIAndHostPermissions) {
   ASSERT_FALSE(prefs->DidExtensionEscalatePermissions(extension_id));
 
   std::set<std::string> current_api_permissions;
-  ExtensionExtent current_host_permissions;
+  URLPatternSet current_host_permissions;
   bool current_full_access;
 
   ASSERT_TRUE(prefs->GetGrantedPermissions(extension_id,
@@ -1517,7 +1517,7 @@ TEST_F(ExtensionServiceTest, GrantedAPIAndHostPermissions) {
   api_permissions.clear();
   host_permissions.clear();
   current_api_permissions.clear();
-  current_host_permissions.ClearPaths();
+  current_host_permissions.ClearPatterns();
 
   api_permissions.insert("tabs");
   host_permissions.insert("http://*.google.com/*");
@@ -1553,7 +1553,7 @@ TEST_F(ExtensionServiceTest, GrantedAPIAndHostPermissions) {
   // Tests that the granted permissions preferences are initialized when
   // migrating from the old pref schema.
   current_api_permissions.clear();
-  current_host_permissions.ClearPaths();
+  current_host_permissions.ClearPatterns();
 
   ClearPref(extension_id, "granted_permissions");
 
@@ -1836,7 +1836,7 @@ TEST_F(ExtensionServiceTest, InstallAppsWithUnlimtedStorage) {
   const std::string id1 = extension->id();
   EXPECT_TRUE(extension->HasApiPermission(
                   Extension::kUnlimitedStoragePermission));
-  EXPECT_TRUE(extension->web_extent().ContainsURL(
+  EXPECT_TRUE(extension->web_extent().MatchesURL(
                   extension->GetFullLaunchURL()));
   const GURL origin1(extension->GetFullLaunchURL().GetOrigin());
   EXPECT_TRUE(profile_->GetExtensionSpecialStoragePolicy()->
@@ -1850,7 +1850,7 @@ TEST_F(ExtensionServiceTest, InstallAppsWithUnlimtedStorage) {
   const std::string id2 = extension->id();
   EXPECT_TRUE(extension->HasApiPermission(
                   Extension::kUnlimitedStoragePermission));
-  EXPECT_TRUE(extension->web_extent().ContainsURL(
+  EXPECT_TRUE(extension->web_extent().MatchesURL(
                   extension->GetFullLaunchURL()));
   const GURL origin2(extension->GetFullLaunchURL().GetOrigin());
   EXPECT_EQ(origin1, origin2);
diff --git a/chrome/browser/extensions/extension_webrequest_api.cc b/chrome/browser/extensions/extension_webrequest_api.cc
index 63ddd3e..f325e7f 100644
--- a/chrome/browser/extensions/extension_webrequest_api.cc
+++ b/chrome/browser/extensions/extension_webrequest_api.cc
@@ -805,7 +805,7 @@ ExtensionWebRequestEventRouter::GetMatchingListeners(
   std::set<EventListener>& listeners = listeners_[profile_id][event_name];
   for (std::set<EventListener>::iterator it = listeners.begin();
        it != listeners.end(); ++it) {
-    if (!it->filter.urls.is_empty() && !it->filter.urls.ContainsURL(url))
+    if (!it->filter.urls.is_empty() && !it->filter.urls.MatchesURL(url))
       continue;
     if (it->filter.tab_id != -1 && tab_id != it->filter.tab_id)
       continue;
diff --git a/chrome/browser/extensions/extension_webrequest_api.h b/chrome/browser/extensions/extension_webrequest_api.h
index 3c83a5e..8913702 100644
--- a/chrome/browser/extensions/extension_webrequest_api.h
+++ b/chrome/browser/extensions/extension_webrequest_api.h
@@ -15,7 +15,7 @@
 #include "base/time.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/common/extensions/extension_extent.h"
+#include "chrome/common/extensions/url_pattern_set.h"
 #include "ipc/ipc_message.h"
 #include "net/base/completion_callback.h"
 #include "webkit/glue/resource_type.h"
@@ -52,7 +52,7 @@ class ExtensionWebRequestEventRouter {
   // Internal representation of the webRequest.RequestFilter type, used to
   // filter what network events an extension cares about.
   struct RequestFilter {
-    ExtensionExtent urls;
+    URLPatternSet urls;
     std::vector<ResourceType::Type> types;
     int tab_id;
     int window_id;
diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc
index 37e4fd9..813461a 100644
--- a/chrome/browser/extensions/extensions_ui.cc
+++ b/chrome/browser/extensions/extensions_ui.cc
@@ -792,7 +792,7 @@ void ExtensionsDOMHandler::GetActivePagesForExtensionProcess(
     if (url.SchemeIs(chrome::kExtensionScheme)) {
       if (url.host() != extension->id())
         continue;
-    } else if (!extension->web_extent().ContainsURL(url)) {
+    } else if (!extension->web_extent().MatchesURL(url)) {
       continue;
     }
 
diff --git a/chrome/browser/extensions/user_script_listener.cc b/chrome/browser/extensions/user_script_listener.cc
index 8586b0e..dcc64c8 100644
--- a/chrome/browser/extensions/user_script_listener.cc
+++ b/chrome/browser/extensions/user_script_listener.cc
@@ -50,7 +50,7 @@ bool UserScriptListener::ShouldDelayRequest(
 
   for (URLPatterns::iterator it = url_patterns_.begin();
        it != url_patterns_.end(); ++it) {
-    if ((*it).MatchesUrl(request->url())) {
+    if ((*it).MatchesURL(request->url())) {
       // One of the user scripts wants to inject into this request, but the
       // script isn't ready yet. Delay the request.
       delayed_request_ids_.push_front(request_id);
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index 8d9969f..4885965 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -243,12 +243,12 @@ static bool ExtensionContextMatch(const ContextMenuParams& params,
   return false;
 }
 
-static bool ExtensionPatternMatch(const ExtensionExtent& patterns,
+static bool ExtensionPatternMatch(const URLPatternSet& patterns,
                                   const GURL& url) {
   // No patterns means no restriction, so that implicitly matches.
   if (patterns.is_empty())
     return true;
-  return patterns.ContainsURL(url);
+  return patterns.MatchesURL(url);
 }
 
 static const GURL& GetDocumentURL(const ContextMenuParams& params) {
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index c423f67..13e2a7c 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -577,7 +577,7 @@ TabContents* Browser::OpenApplicationWindow(
   GURL url;
   if (!url_input.is_empty()) {
     if (extension)
-      DCHECK(extension->web_extent().ContainsURL(url_input));
+      DCHECK(extension->web_extent().MatchesURL(url_input));
     url = url_input;
   } else {
     DCHECK(extension);  // Empty url and no extension.  Nothing to open.
diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.cc b/chrome/browser/ui/webui/options/extension_settings_handler.cc
index c1760b7..7f0e369 100644
--- a/chrome/browser/ui/webui/options/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/extension_settings_handler.cc
@@ -871,7 +871,7 @@ void ExtensionsDOMHandler::GetActivePagesForExtensionProcess(
     if (url.SchemeIs(chrome::kExtensionScheme)) {
       if (url.host() != extension->id())
         continue;
-    } else if (!extension->web_extent().ContainsURL(url)) {
+    } else if (!extension->web_extent().MatchesURL(url)) {
       continue;
     }