| Index: chrome/browser/renderer_host/chrome_render_message_filter.cc | 
| diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.cc b/chrome/browser/renderer_host/chrome_render_message_filter.cc | 
| index c1a0eb82980ceae3f6ce3f2f2d1c05e332a7d3be..784553c75d79d0c68ab3c507a4b78103b2943cea 100644 | 
| --- a/chrome/browser/renderer_host/chrome_render_message_filter.cc | 
| +++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc | 
| @@ -352,14 +352,18 @@ void ChromeRenderMessageFilter::OnGetExtensionMessageBundleOnFileThread( | 
|  | 
| void ChromeRenderMessageFilter::OnExtensionAddListener( | 
| const std::string& extension_id, | 
| -    const std::string& event_name) { | 
| +    const std::string& event_name, | 
| +    int context_type) { | 
| content::RenderProcessHost* process = | 
| content::RenderProcessHost::FromID(render_process_id_); | 
| if (!process || !profile_->GetExtensionEventRouter()) | 
| return; | 
|  | 
| profile_->GetExtensionEventRouter()->AddEventListener( | 
| -      event_name, process, extension_id); | 
| +      event_name, | 
| +      extension_id, | 
| +      process, | 
| +      static_cast<extensions::Feature::Context>(context_type)); | 
| } | 
|  | 
| void ChromeRenderMessageFilter::OnExtensionRemoveListener( | 
| @@ -375,10 +379,19 @@ void ChromeRenderMessageFilter::OnExtensionRemoveListener( | 
| } | 
|  | 
| void ChromeRenderMessageFilter::OnExtensionAddLazyListener( | 
| -    const std::string& extension_id, const std::string& event_name) { | 
| -  if (profile_->GetExtensionEventRouter()) | 
| -    profile_->GetExtensionEventRouter()->AddLazyEventListener( | 
| -        event_name, extension_id); | 
| +    const std::string& extension_id, | 
| +    const std::string& event_name, | 
| +    int context_type) { | 
| +  content::RenderProcessHost* process = | 
| +      content::RenderProcessHost::FromID(render_process_id_); | 
| +  if (!process || !profile_->GetExtensionEventRouter()) | 
| +    return; | 
| + | 
| +  profile_->GetExtensionEventRouter()->AddLazyEventListener( | 
| +      event_name, | 
| +      extension_id, | 
| +      process, | 
| +      static_cast<extensions::Feature::Context>(context_type)); | 
| } | 
|  | 
| void ChromeRenderMessageFilter::OnExtensionRemoveLazyListener( | 
|  |