| Index: chrome/browser/renderer_host/chrome_render_view_host_observer.cc
|
| diff --git a/chrome/browser/renderer_host/chrome_render_view_host_observer.cc b/chrome/browser/renderer_host/chrome_render_view_host_observer.cc
|
| index 32db30bfce47beff0ebb0cc63398e3dad1cc2557..d89d05909de7b2ddde4b24f3c1257805598d0dd5 100644
|
| --- a/chrome/browser/renderer_host/chrome_render_view_host_observer.cc
|
| +++ b/chrome/browser/renderer_host/chrome_render_view_host_observer.cc
|
| @@ -87,8 +87,8 @@ void ChromeRenderViewHostObserver::InitRenderViewForExtensions() {
|
| ChildProcessSecurityPolicy::GetInstance()->GrantScheme(
|
| process->GetID(), chrome::kChromeUIScheme);
|
|
|
| - if (profile_->GetExtensionService()->extension_prefs()->AllowFileAccess(
|
| - extension->id())) {
|
| + if (extensions::ExtensionSystem::Get(profile_)->extension_service()->
|
| + extension_prefs()->AllowFileAccess(extension->id())) {
|
| ChildProcessSecurityPolicy::GetInstance()->GrantScheme(
|
| process->GetID(), chrome::kFileScheme);
|
| }
|
| @@ -126,7 +126,8 @@ const Extension* ChromeRenderViewHostObserver::GetExtension() {
|
| if (!site.SchemeIs(extensions::kExtensionScheme))
|
| return NULL;
|
|
|
| - ExtensionService* service = profile_->GetExtensionService();
|
| + ExtensionService* service =
|
| + extensions::ExtensionSystem::Get(profile_)->extension_service();
|
| if (!service)
|
| return NULL;
|
|
|
|
|