Fix bugs in filtered event removal code

extensions/browser/event_router.cc

Index: extensions/browser/event_router.cc
diff --git a/extensions/browser/event_router.cc b/extensions/browser/event_router.cc
index e70a78c528aaf8a774142fc846997502fd294679..5dcb3b307de0a671cd896715e0ae167220acc632 100644
--- a/extensions/browser/event_router.cc
+++ b/extensions/browser/event_router.cc
@@ -419,9 +419,9 @@ void EventRouter::RemoveFilterFromEvent(const std::string& event_name,
   }
 
   for (size_t i = 0; i < filter_list->GetSize(); i++) {
-    DictionaryValue* filter = NULL;
-    CHECK(filter_list->GetDictionary(i, &filter));
-    if (filter->Equals(filter)) {
+    DictionaryValue* filter_value = NULL;
+    CHECK(filter_list->GetDictionary(i, &filter_value));
+    if (filter_value->Equals(filter)) {

[Devlin, 2016/11/24 01:21:32]

...

so this meant we were always removing the first filter whenever this was called?

[lazyboy, 2016/12/02 21:13:28]

*Almost*.
The fact that we had bug in writing those filtered events in prefs made this
Equals bug obscure.

       filter_list->Remove(i, NULL);
       break;
     }