WIP: diff which plumbs through the event URL.

extensions/browser/event_listener_map.cc

 // Copyright 2013 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/browser/event_listener_map.h"
 
 #include "base/values.h"
 #include "content/public/browser/render_process_host.h"
 #include "extensions/browser/event_router.h"
 #include "ipc/ipc_message.h"
+#include "url/gurl.h"
 
 using base::DictionaryValue;
 
 namespace extensions {
 
 typedef EventFilter::MatcherID MatcherID;
 
 EventListener::EventListener(const std::string& event_name,
                              const std::string& extension_id,
+                             const GURL& listener_url,
                              content::RenderProcessHost* process,
                              scoped_ptr<DictionaryValue> filter)
     : event_name_(event_name),
       extension_id_(extension_id),
+      listener_url_(listener_url),
       process_(process),
       filter_(filter.Pass()),
       matcher_id_(-1) {
 }
 
 EventListener::~EventListener() {}
 
 bool EventListener::Equals(const EventListener* other) const {
   // We don't check matcher_id equality because we want a listener with a
   // filter that hasn't been added to EventFilter to match one that is
   // equivalent but has.
   return event_name_ == other->event_name_ &&
-         extension_id_ == other->extension_id_ && process_ == other->process_ &&
+         extension_id_ == other->extension_id_ &&
+         listener_url_ == other->listener_url_ && process_ == other->process_ &&
          ((!!filter_.get()) == (!!other->filter_.get())) &&
          (!filter_.get() || filter_->Equals(other->filter_.get()));
 }
 
 scoped_ptr<EventListener> EventListener::Copy() const {
   scoped_ptr<DictionaryValue> filter_copy;
   if (filter_)
     filter_copy.reset(filter_->DeepCopy());
   return scoped_ptr<EventListener>(new EventListener(
-      event_name_, extension_id_, process_, filter_copy.Pass()));
+      event_name_, extension_id_, listener_url_, process_, filter_copy.Pass()));
 }
 
 bool EventListener::IsLazy() const {
   return !process_;
 }
 
 void EventListener::MakeLazy() {
   process_ = NULL;
 }
 
@@ skipping 80 matching lines @@
   }
   return false;
 }
 
 bool EventListenerMap::HasProcessListener(content::RenderProcessHost* process,
                                           const std::string& extension_id) {
   for (ListenerMap::iterator it = listeners_.begin(); it != listeners_.end();
        it++) {
     for (ListenerList::iterator it2 = it->second.begin();
          it2 != it->second.end(); it2++) {
+      // TODO(kalman): Thread listener_url into here?
       if ((*it2)->process() == process &&
           (*it2)->extension_id() == extension_id)
         return true;
     }
   }
   return false;
 }
 
 void EventListenerMap::RemoveLazyListenersForExtension(
     const std::string& extension_id) {
@@ skipping 10 matching lines @@
     }
   }
 }
 
 void EventListenerMap::LoadUnfilteredLazyListeners(
     const std::string& extension_id,
     const std::set<std::string>& event_names) {
   for (std::set<std::string>::const_iterator it = event_names.begin();
        it != event_names.end(); ++it) {
     AddListener(scoped_ptr<EventListener>(new EventListener(
-        *it, extension_id, NULL, scoped_ptr<DictionaryValue>())));
+        *it, extension_id, GURL(), NULL, scoped_ptr<DictionaryValue>())));
   }
 }
 
 void EventListenerMap::LoadFilteredLazyListeners(
     const std::string& extension_id,
     const DictionaryValue& filtered) {
   for (DictionaryValue::Iterator it(filtered); !it.IsAtEnd(); it.Advance()) {
     // We skip entries if they are malformed.
     const base::ListValue* filter_list = NULL;
     if (!it.value().GetAsList(&filter_list))
       continue;
     for (size_t i = 0; i < filter_list->GetSize(); i++) {
       const DictionaryValue* filter = NULL;
       if (!filter_list->GetDictionary(i, &filter))
         continue;
-      AddListener(scoped_ptr<EventListener>(new EventListener(
-          it.key(), extension_id, NULL,
-          scoped_ptr<DictionaryValue>(filter->DeepCopy()))));
+      AddListener(scoped_ptr<EventListener>(
+          new EventListener(it.key(),
+                            extension_id,
+                            GURL(),
+                            NULL,
+                            scoped_ptr<DictionaryValue>(filter->DeepCopy()))));
     }
   }
 }
 
 std::set<const EventListener*> EventListenerMap::GetEventListeners(
     const Event& event) {
   std::set<const EventListener*> interested_listeners;
   if (IsFilteredEvent(event)) {
     // Look up the interested listeners via the EventFilter.
     std::set<MatcherID> ids =
@@ skipping 41 matching lines @@
     return;
   event_filter_.RemoveEventMatcher(listener->matcher_id());
   CHECK_EQ(1u, listeners_by_matcher_id_.erase(listener->matcher_id()));
 }
 
 bool EventListenerMap::IsFilteredEvent(const Event& event) const {
   return filtered_events_.count(event.event_name) > 0u;
 }
 
 }  // namespace extensions