| Index: chrome/browser/extensions/extension_service.cc
|
| diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
|
| index 73a7c635a0b65d6d6187a6411bbd0c7bfb4a459d..94e681209061e992e34b2257d6e3e7ccf2faa461 100644
|
| --- a/chrome/browser/extensions/extension_service.cc
|
| +++ b/chrome/browser/extensions/extension_service.cc
|
| @@ -264,8 +264,7 @@ bool ExtensionService::OnExternalExtensionUpdateUrlFound(
|
| }
|
|
|
| const Extension* ExtensionService::GetInstalledApp(const GURL& url) const {
|
| - const Extension* extension = extensions_.GetExtensionOrAppByURL(
|
| - ExtensionURLInfo(url));
|
| + const Extension* extension = extensions_.GetExtensionOrAppByURL(url);
|
| return (extension && extension->is_app()) ? extension : NULL;
|
| }
|
|
|
| @@ -2584,15 +2583,13 @@ const Extension* ExtensionService::GetInstalledExtension(
|
|
|
| bool ExtensionService::ExtensionBindingsAllowed(const GURL& url) {
|
| // Allow bindings for all packaged extensions and component hosted apps.
|
| - const Extension* extension = extensions_.GetExtensionOrAppByURL(
|
| - ExtensionURLInfo(url));
|
| + const Extension* extension = extensions_.GetExtensionOrAppByURL(url);
|
| return extension && (!extension->is_hosted_app() ||
|
| extension->location() == Manifest::COMPONENT);
|
| }
|
|
|
| bool ExtensionService::ShouldBlockUrlInBrowserTab(GURL* url) {
|
| - const Extension* extension = extensions_.GetExtensionOrAppByURL(
|
| - ExtensionURLInfo(*url));
|
| + const Extension* extension = extensions_.GetExtensionOrAppByURL(*url);
|
| if (extension && extension->is_platform_app()) {
|
| *url = GURL(chrome::kExtensionInvalidRequestURL);
|
| return true;
|
|
|