| 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..b57e0437fce64cf3a6b1c67ebe21f84f124b3f5a 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -178,7 +178,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())
|
| @@ -377,7 +378,7 @@ GURL ChromeContentBrowserClient::GetEffectiveURL(
|
| return url;
|
|
|
| const Extension* extension =
|
| - profile->GetExtensionService()->GetExtensionByWebExtent(url);
|
| + profile->GetExtensionService()->extensions()->GetByWebExtent(url);
|
| if (!extension)
|
| return url;
|
|
|
| @@ -403,8 +404,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 +486,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 +514,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;
|
|
|
|
|