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

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 6856cbfdd47ad4dd3021d2bd76f4444aebf8b0fa..de8b65947c096aa1574f142264a006e3159632c8 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -57,6 +57,7 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
@@ -178,7 +179,8 @@ RenderProcessHostPrivilege GetPrivilegeRequiredByUrl(
     return PRIV_NORMAL;
 
   if (url.SchemeIs(chrome::kExtensionScheme)) {
-    const Extension* extension = service->GetExtensionByURL(url);
+    const Extension* extension =
+        service->extensions()->GetByURL(ExtensionURLInfo(url));
     if (extension && extension->is_storage_isolated())
       return PRIV_ISOLATED;
     if (extension && extension->is_hosted_app())
@@ -376,8 +378,8 @@ GURL ChromeContentBrowserClient::GetEffectiveURL(
   if (!profile || !profile->GetExtensionService())
     return url;
 
-  const Extension* extension =
-      profile->GetExtensionService()->GetExtensionByWebExtent(url);
+  const Extension* extension = profile->GetExtensionService()->extensions()->
+      GetByWebExtent(ExtensionURLInfo(url));
   if (!extension)
     return url;
 
@@ -403,8 +405,8 @@ bool ChromeContentBrowserClient::ShouldUseProcessPerSite(
   if (!profile || !profile->GetExtensionService())
     return false;
 
-  const Extension* extension =
-      profile->GetExtensionService()->GetExtensionByURL(effective_url);
+  const Extension* extension = profile->GetExtensionService()->extensions()->
+      GetByURL(ExtensionURLInfo(effective_url));
   if (!extension)
     return false;
 
@@ -485,9 +487,7 @@ void ChromeContentBrowserClient::SiteInstanceGotProcess(
     return;
 
   const Extension* extension =
-      service->GetExtensionByURL(site_instance->site());
-  if (!extension)
-    extension = service->GetExtensionByWebExtent(site_instance->site());
+      service->extensions()->GetByURL(ExtensionURLInfo(site_instance->site()));
   if (!extension)
     return;
 
@@ -515,9 +515,7 @@ void ChromeContentBrowserClient::SiteInstanceDeleting(
     return;
 
   const Extension* extension =
-      service->GetExtensionByURL(site_instance->site());
-  if (!extension)
-    extension = service->GetExtensionByWebExtent(site_instance->site());
+      service->extensions()->GetByURL(ExtensionURLInfo(site_instance->site()));
   if (!extension)
     return;