| 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 2064921114ad69470535857a06978876f4a4b6e6..b9500477b03faa5dfad6c957ae10346ef516d306 100644
|
| --- a/chrome/browser/renderer_host/chrome_render_view_host_observer.cc
|
| +++ b/chrome/browser/renderer_host/chrome_render_view_host_observer.cc
|
| @@ -101,8 +101,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);
|
| }
|
| @@ -140,7 +140,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;
|
|
|
|
|