Index: chrome/content/tests/popupBlocker.js
===================================================================
--- a/chrome/content/tests/popupBlocker.js
+++ b/chrome/content/tests/popupBlocker.js
@@ -67,26 +67,16 @@
     ["||127.0.0.1:1234/target$popup", false],
     ["||127.0.0.1:1234/target$~subdocument", true],
     ["||127.0.0.1:1234/target$popup,domain=127.0.0.1", false],
     ["||127.0.0.1:1234/target$popup,domain=128.0.0.1", true],
     ["||127.0.0.1:1234/redirect$popup", false],
     ["||127.0.0.1:1234/redirect$~subdocument", true],
     ["||127.0.0.1:1234/redirect$popup,domain=127.0.0.1", false],
     ["||127.0.0.1:1234/redirect$popup,domain=128.0.0.1", true],
-
-    // These are messed up by bug 467514 (a click inside a frame opening a new
-    // tab should be considered as type document, not subdocument). We cannot
-    // fix the bug but at least we can ensure consistent results.
-    ["||127.0.0.1:1234/target$subdocument", false],
-    ["||127.0.0.1:1234/target$subdocument,domain=127.0.0.1", false],
-    ["||127.0.0.1:1234/target$subdocument,domain=128.0.0.1", true],
-    ["||127.0.0.1:1234/redirect$subdocument", false],
-    ["||127.0.0.1:1234/redirect$subdocument,domain=127.0.0.1", false],
-    ["||127.0.0.1:1234/redirect$subdocument,domain=128.0.0.1", true],
   ];
 
   function runTest(filter, result)
   {
     FilterStorage.addFilter(filter);
 
     let successful = false;
     let wnd = Utils.getChromeWindow(window);
@@ -112,17 +102,16 @@
 
     function onTabClose(event)
     {
       wnd.gBrowser.tabContainer.removeEventListener("TabClose", onTabClose, false);
       ok(result == successful, "Opening tab with filter " + filter.text);
       var keys = [];
       for (key in defaultMatcher.blacklist.keywordByFilter)
         keys.push(key);
-      Cu.reportError(filter instanceof RegExpFilter);
 
       FilterStorage.removeFilter(filter);
       start();
     }
 
     wnd.gBrowser.tabContainer.addEventListener("TabOpen", onTabOpen, false);
     wnd.gBrowser.tabContainer.addEventListener("TabClose", onTabClose, false);
     let timeout = window.setTimeout(onTabClose, 1000);    // In case the tab isn't opened