WIP: diff which plumbs through the event URL.

extensions/renderer/event_bindings.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/renderer/event_bindings.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 132 matching lines @@
   CHECK(args[0]->IsString());
 
   std::string event_name = *v8::String::Utf8Value(args[0]->ToString());
 
   if (!dispatcher_->CheckContextAccessToExtensionAPI(event_name, context()))
     return;
 
   std::string extension_id = context()->GetExtensionID();
   EventListenerCounts& listener_counts = g_listener_counts.Get()[extension_id];
   if (++listener_counts[event_name] == 1) {
-    content::RenderThread::Get()->Send(
-        new ExtensionHostMsg_AddListener(extension_id, event_name));
+    content::RenderThread::Get()->Send(new ExtensionHostMsg_AddListener(
+        extension_id, context()->GetURL(), event_name));
   }
 
   // This is called the first time the page has added a listener. Since
   // the background page is the only lazy page, we know this is the first
   // time this listener has been registered.
   if (IsLazyBackgroundPage(context()->GetRenderView(),
                            context()->extension())) {
     content::RenderThread::Get()->Send(
         new ExtensionHostMsg_AddLazyListener(extension_id, event_name));
   }
 }
 
 void EventBindings::DetachEvent(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   CHECK_EQ(2, args.Length());
   CHECK(args[0]->IsString());
   CHECK(args[1]->IsBoolean());
 
   std::string event_name = *v8::String::Utf8Value(args[0]);
   bool is_manual = args[1]->BooleanValue();
 
   std::string extension_id = context()->GetExtensionID();
   EventListenerCounts& listener_counts = g_listener_counts.Get()[extension_id];
 
   if (--listener_counts[event_name] == 0) {
-    content::RenderThread::Get()->Send(
-        new ExtensionHostMsg_RemoveListener(extension_id, event_name));
+    content::RenderThread::Get()->Send(new ExtensionHostMsg_RemoveListener(
+        extension_id, context()->GetURL(), event_name));
   }
 
   // DetachEvent is called when the last listener for the context is
   // removed. If the context is the background page, and it removes the
   // last listener manually, then we assume that it is no longer interested
   // in being awakened for this event.
   if (is_manual && IsLazyBackgroundPage(context()->GetRenderView(),
                                         context()->extension())) {
     content::RenderThread::Get()->Send(
         new ExtensionHostMsg_RemoveLazyListener(extension_id, event_name));
@@ skipping 108 matching lines @@
 }
 
 scoped_ptr<EventMatcher> EventBindings::ParseEventMatcher(
     base::DictionaryValue* filter_dict) {
   return scoped_ptr<EventMatcher>(new EventMatcher(
       scoped_ptr<base::DictionaryValue>(filter_dict->DeepCopy()),
       context()->GetRenderView()->GetRoutingID()));
 }
 
 }  // namespace extensions