commit 615d88f4d005b8f9f79b5bf65ac21d927a46fda2
author yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Dec 13 01:47:44 2011
committer yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Dec 13 01:47:44 2011
tree 489be1953f84aa25184cd37a3145eae70260ea66
parent ee5a21bc9171c6b1d4c852b226e2545bb2340f6f

Move/replace/rename URL-based extension getters from ExtensionService to/in ExtensionSet.

ExtensionService::GetExtensionByURL -> GetByID with the host
ExtensionService::GetExtensionByWebExtent -> GetHostedAppByURL
GetByURL -> GetExtensionOrAppByURL

BUG=104091
TEST=existing tests


Review URL: http://codereview.chromium.org/8827013

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

chrome/browser/extensions/extension_info_map_unittest.cc

diff --git a/chrome/browser/extensions/extension_info_map_unittest.cc b/chrome/browser/extensions/extension_info_map_unittest.cc
index b823960..a0a05a37 100644
--- a/chrome/browser/extensions/extension_info_map_unittest.cc
+++ b/chrome/browser/extensions/extension_info_map_unittest.cc
@@ -144,11 +144,11 @@
 
   // The app should have the notifications permission, either from a
   // chrome-extension URL or from its web extent.
-  const Extension* match = info_map->extensions().GetByURL(
+  const Extension* match = info_map->extensions().GetExtensionOrAppByURL(
       ExtensionURLInfo(app_origin, app->GetResourceURL("a.html")));
   EXPECT_TRUE(match &&
       match->HasAPIPermission(ExtensionAPIPermission::kNotification));
-  match = info_map->extensions().GetByURL(
+  match = info_map->extensions().GetExtensionOrAppByURL(
       ExtensionURLInfo(app_origin, app_url));
   EXPECT_TRUE(match &&
       match->HasAPIPermission(ExtensionAPIPermission::kNotification));
@@ -156,7 +156,7 @@
       match->HasAPIPermission(ExtensionAPIPermission::kTab));
 
   // The extension should have the tabs permission.
-  match = info_map->extensions().GetByURL(
+  match = info_map->extensions().GetExtensionOrAppByURL(
       ExtensionURLInfo(app_origin, extension->GetResourceURL("a.html")));
   EXPECT_TRUE(match &&
       match->HasAPIPermission(ExtensionAPIPermission::kTab));
@@ -165,12 +165,12 @@
 
   // Random URL should not have any permissions.
   GURL evil_url("http://evil.com/a.html");
-  match = info_map->extensions().GetByURL(
+  match = info_map->extensions().GetExtensionOrAppByURL(
       ExtensionURLInfo(WebSecurityOrigin::create(evil_url), evil_url));
   EXPECT_FALSE(match);
 
   // Sandboxed origins should not have any permissions.
-  match = info_map->extensions().GetByURL(ExtensionURLInfo(
+  match = info_map->extensions().GetExtensionOrAppByURL(ExtensionURLInfo(
       WebSecurityOrigin::createFromString(WebString::fromUTF8("null")),
       app_url));
   EXPECT_FALSE(match);