Issue 5832 - Use runtime.onMessage directly in popup

popup.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 25 matching lines @@
 
 function whenPageReady()
 {
   return new Promise(resolve =>
   {
     function onMessage(message, sender)
     {
       if (message.type == "composer.ready" && sender.page &&
           sender.page.id == tab.id)
       {
-        ext.onMessage.removeListener(onMessage);
+        chrome.runtime.onMessage.removeListener(onMessage);
         resolve();
       }
     }
 
-    ext.onMessage.addListener(onMessage);
+    chrome.runtime.onMessage.addListener(onMessage);
 
     chrome.runtime.sendMessage({
       type: "composer.isPageReady",
       pageId: tab.id
     },
     ready =>
     {
       if (ready)
       {
-        ext.onMessage.removeListener(onMessage);
+        chrome.runtime.onMessage.removeListener(onMessage);
         resolve();
       }
     });
   });
 }
 
 function onLoad()
 {
   chrome.tabs.query({active: true, lastFocusedWindow: true}, tabs =>
   {
@@ skipping 102 matching lines @@
 
 function toggleCollapse(event)
 {
   let collapser = event.currentTarget;
   let collapsible = document.getElementById(collapser.dataset.collapsible);
   collapsible.classList.toggle("collapsed");
   togglePref(collapser.dataset.option);
 }
 
 document.addEventListener("DOMContentLoaded", onLoad, false);