| Index: content/browser/site_instance.cc
|
| ===================================================================
|
| --- content/browser/site_instance.cc (revision 80243)
|
| +++ content/browser/site_instance.cc (working copy)
|
| @@ -4,7 +4,6 @@
|
|
|
| #include "content/browser/site_instance.h"
|
|
|
| -#include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/renderer_host/browser_render_process_host.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "content/browser/browsing_instance.h"
|
| @@ -190,18 +189,7 @@
|
|
|
| /*static*/
|
| GURL SiteInstance::GetEffectiveURL(Profile* profile, const GURL& url) {
|
| - if (!profile || !profile->GetExtensionService())
|
| - return url;
|
| -
|
| - const Extension* extension =
|
| - profile->GetExtensionService()->GetExtensionByWebExtent(url);
|
| - if (extension) {
|
| - // If the URL is part of an extension's web extent, convert it to an
|
| - // extension URL.
|
| - return extension->GetResourceURL(url.path());
|
| - } else {
|
| - return url;
|
| - }
|
| + return content::GetContentClient()->browser()->GetEffectiveURL(profile, url);
|
| }
|
|
|
| /*static*/
|
|
|