summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_info_map_unittest.cc
diff options
context:
space:
mode:
authormorrita@chromium.org <morrita@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-20 08:31:12 +0000
committermorrita@chromium.org <morrita@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-20 08:31:12 +0000
commitcced75a6e7444d9bda0f9dd72f5871e095acf5df (patch)
treed45fc18c620970fe947e8257bfffd8fdf07f6ab0 /chrome/browser/extensions/extension_info_map_unittest.cc
parent3b8c5a6f7b3a780001da6f8f1084b82d9f9d5b33 (diff)
downloadchromium_src-cced75a6e7444d9bda0f9dd72f5871e095acf5df.zip
chromium_src-cced75a6e7444d9bda0f9dd72f5871e095acf5df.tar.gz
chromium_src-cced75a6e7444d9bda0f9dd72f5871e095acf5df.tar.bz2
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
Diffstat (limited to 'chrome/browser/extensions/extension_info_map_unittest.cc')
-rw-r--r--chrome/browser/extensions/extension_info_map_unittest.cc2
1 files changed, 1 insertions, 1 deletions
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);