Issue 3868 - Use the new FilterNotifier API

lib/icon.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 54 matching lines @@
   }
   else
   {
     chrome.browserAction.setIcon({
       tabId: page.id,
       imageData: frames["" + opacity + whitelisted]
     });
   }
 }
 
-FilterNotifier.addListener((action, page, filter) =>
+FilterNotifier.on("page.WhitelistingStateRevalidate", (page, filter) =>
 {
-  if (action == "page.WhitelistingStateRevalidate")
-  {
-    whitelistedState.set(page, !!filter);
-    if (canUpdateIcon)
-      setIcon(page);
-  }
+  whitelistedState.set(page, !!filter);
+  if (canUpdateIcon)
+    setIcon(page);
 });
 
 function renderFrames(notificationType)
 {
   if (safariPlatform)
     return Promise.resolve(null);
 
   return Promise.all([
     loadImage("icons/abp-19.png"),
     loadImage("icons/abp-19-whitelisted.png"),
@@ skipping 120 matching lines @@
           clearInterval(interval);
           resolve();
           return;
         }
 
         animateIcon(type, frames);
       }, 10000);
     });
   });
 };