Fixed: Popup blocking functionality broken

popupBlocker.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 if (require("info").platform == "chromium" && "webNavigation" in chrome)
 {
-  var tabsLoading = {};
+  var tabsLoading = new TabMap();
 
-  chrome.webNavigation.onCreatedNavigationTarget.addListener(function(details)
+  ext.webNavigation.onCreatedNavigationTarget.addListener(function(details)
   {
-    if (isFrameWhitelisted(details.sourceTabId, details.sourceFrameId))
+    if (isFrameWhitelisted(details.sourceTab, details.sourceFrameId))
       return;
 
-    var openerUrl = getFrameUrl(details.sourceTabId, details.sourceFrameId);
+    var openerUrl = getFrameUrl(details.sourceTab, details.sourceFrameId);
     if (!openerUrl)
     {
       // We don't know the opener tab
       return;
     }
-    tabsLoading[details.tabId] = openerUrl;
+    tabsLoading.set(details.tab, openerUrl);
 
-    checkPotentialPopup(details.tabId, details.url, openerUrl);
+    checkPotentialPopup(details.tab, openerUrl);
   });
 
-  chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab)
+  ext.tabs.onCompleted.addListener(function(tab)
   {
-    if (!(tabId in tabsLoading))
+    if (!tabsLoading.has(tab))
     {
       // Not a pop-up we've previously seen
       return;
     }
 
-    if ("url" in changeInfo)
-      checkPotentialPopup(tabId, tab.url, tabsLoading[tabId]);
+    checkPotentialPopup(tab, tabsLoading.get(tab));
 
-    if ("status" in changeInfo && changeInfo.status == "complete" && tab.url != "about:blank")
-      delete tabsLoading[tabId];
+    if (tab.url != "about:blank")
+      tabsLoading.delete(tab);
   });
 }
 
-function checkPotentialPopup(tabId, url, opener)
+function checkPotentialPopup(tab, openerUrl)
 {
-  var requestHost = extractHostFromURL(url);
-  var documentHost = extractHostFromURL(opener);
+  var requestHost = extractHostFromURL(tab.url);
+  var documentHost = extractHostFromURL(openerUrl);
   var thirdParty = isThirdParty(requestHost, documentHost);
-  var filter = defaultMatcher.matchesAny(url || "about:blank", "POPUP", documentHost, thirdParty);
+  var filter = defaultMatcher.matchesAny(tab.url || "about:blank", "POPUP", documentHost, thirdParty);
   if (filter instanceof BlockingFilter)
-    chrome.tabs.remove(tabId);
+    tab.close();
 }