Issue 3868 - Use the new FilterNotifier API

lib/devtools.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 239 matching lines @@
   // previous URL.
   if (panel && panel.reload)
   {
     chrome.tabs.reload(tabId, {bypassCache: true});
 
     panel.reload = false;
     panel.reloading = true;
   }
 }
 
-function onFilterChange(action, arg)
+function updateFilters(filters, added)
 {
-  let added, filters;
-  switch (action)
-  {
-    case "filter.added":
-      added = true;
-      filters = [arg];
-      break;
-
-    case "filter.removed":
-      added = false;
-      filters = [arg];
-      break;
-
-    // When there haven't ever been any user filters before, the subscription is
-    // added, triggering a "subscription.added" instead of a "filter.added" event.
-    case "subscription.added":
-      if (arg instanceof SpecialSubscription)
-      {
-        added = true;
-        filters = arg.filters;
-        break;
-      }
-
-    default:
-      return;
-  }
-
   for (let tabId in panels)
   {
     let panel = panels[tabId];
 
     for (let i = 0; i < panel.records.length; i++)
     {
       let record = panel.records[i];
 
       // If an added filter matches a request shown in the devtools panel,
       // update that record to show the new filter. Ignore filters that aren't
@@ skipping 38 matching lines @@
       panel.port.postMessage({
         type: "update-record",
         index: i,
         request: record.request,
         filter: getFilterInfo(record.filter)
       });
     }
   }
 }
 
+function onFilterAdded(filter)
+{
+  updateFilters([filter], true);
+}
+
+function onFilterRemoved(filter)
+{
+  updateFilters([filter], false);
+}
+
+function onSubscriptionAdded(subscription)
+{
+  if (subscription instanceof SpecialSubscription)
+    updateFilters(subscription.filters, true);
+}
+
 chrome.runtime.onConnect.addListener(port =>
 {
   let match = port.name.match(/^devtools-(\d+)$/);
   if (!match)
     return;
 
   let inspectedTabId = parseInt(match[1], 10);
   let localOnBeforeRequest = onBeforeRequest.bind();
 
   chrome.webRequest.onBeforeRequest.addListener(
     localOnBeforeRequest,
     {
       urls:  ["<all_urls>"],
       types: ["main_frame"],
       tabId: inspectedTabId
     }
   );
 
   if (!hasPanels())
   {
     ext.pages.onLoading.addListener(onLoading);
-    FilterNotifier.addListener(onFilterChange);
+    FilterNotifier.on("filter.added", onFilterAdded);
+    FilterNotifier.on("filter.removed", onFilterRemoved);
+    FilterNotifier.on("subscription.added", onSubscriptionAdded);
   }
 
   port.onDisconnect.addListener(() =>
   {
     delete panels[inspectedTabId];
     chrome.webRequest.onBeforeRequest.removeListener(localOnBeforeRequest);
 
     if (!hasPanels())
     {
-      FilterNotifier.removeListener(onFilterChange);
       ext.pages.onLoading.removeListener(onLoading);
+      FilterNotifier.off("filter.added", onFilterAdded);
+      FilterNotifier.off("filter.removed", onFilterRemoved);
+      FilterNotifier.off("subscription.added", onSubscriptionAdded);
     }
   });
 
   panels[inspectedTabId] = {port: port, records: []};
 });
 
 port.on("devtools.traceElemHide", (message, sender) =>
 {
   logHiddenElements(
     message.page, message.selectors,
     extractHostFromFrame(sender.frame)
   );
 });