Issue 3208 - Improve the approach used to detect pop-up URL

lib/contentPolicy.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 380 matching lines @@
     // be used in earlier releases.
     let httpTopic = "http-on-opening-request";
     if (Services.vc.compare(Utils.platformVersion, "18.0") < 0)
       httpTopic = "http-on-modify-request";
 
     Services.obs.addObserver(this, httpTopic, true);
     Services.obs.addObserver(this, "content-document-global-created", true);
 
     onShutdown.add(function()
     {
-      // Our category observers should be removed before changing category
-      // memberships, just in case.
       Services.obs.removeObserver(this, httpTopic);
       Services.obs.removeObserver(this, "content-document-global-created");
 
       for (let category of this.xpcom_categories)
         catMan.deleteCategoryEntry(category, this.contractID, false);
 
       registrar.unregisterFactory(this.classID, this);
 
       this.previousRequest = null;
     }.bind(this));
@@ skipping 64 matching lines @@
         let uri = additional || Utils.makeURI(subject.location.href);
         if (!Policy.processNode(subject.opener, subject.opener.document, Policy.type.POPUP, uri, false))
         {
           subject.stop();
           Utils.runAsync(() => subject.close());
         }
         else if (uri.spec == "about:blank")
         {
           // An about:blank pop-up most likely means that a load will be
           // initiated asynchronously. Wait for that.
-          Utils.runAsync(function()
+          Utils.runAsync(() =>
           {
             let channel = subject.QueryInterface(Ci.nsIInterfaceRequestor)
                                  .getInterface(Ci.nsIDocShell)
                                  .QueryInterface(Ci.nsIDocumentLoader)
                                  .documentChannel;
             if (channel)
-              this.observe(subject, topic, data, channel.URI.spec);
+              this.observe(subject, topic, data, channel.URI);
           });
         }
         break;
       }
       case "http-on-opening-request":
       case "http-on-modify-request":
       {
         if (!(subject instanceof Ci.nsIHttpChannel))
           return;
 
@@ skipping 271 matching lines @@
   if (!wnd || wnd.closed)
     return;
 
   if (entry.type == Policy.type.OBJECT)
   {
     node.removeEventListener("mouseover", objectMouseEventHander, true);
     node.removeEventListener("mouseout", objectMouseEventHander, true);
   }
   Policy.processNode(wnd, node, entry.type, Utils.makeURI(entry.location), true);
 }