Noissue - Removed obsolete nsIURI compatbility code

lib/utils.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 37 matching lines @@
     Object.defineProperty(this, "appLocale", {value: locale, enumerable: true});
     return this.appLocale;
   },
   generateChecksum: function(lines)
   {
     // We cannot calculate MD5 checksums yet :-(
     return null;
   },
   makeURI: function(url)
   {
-    return Services.io.newURI(url);
+    let urlObj;
+    try
+    {
+      urlObj = new URL(url);
+    }
+    catch (e)

[Sebastian Noack, 2016/04/04 11:22:26]

We previously didn't handle exceptions here, but we did on Firefox. So this is
more consistent/correct.

+    {
+      return null;
+    }
+
+    return {
+      spec: urlObj.href,
+      scheme: urlObj.protocol,
+      host: urlObj.hostname
+    };
   },
-
   checkLocalePrefixMatch: function(prefixes)
   {
     if (!prefixes)
       return null;
 
     var list = prefixes.split(",");
     for (var i = 0; i < list.length; i++)
       if (new RegExp("^" + list[i] + "\\b").test(this.appLocale))
         return list[i];
 
@@ skipping 43 matching lines @@
   {
     var Prefs = require("prefs").Prefs;
     var docLink = Prefs.documentation_link;
     return docLink.replace(/%LINK%/g, linkID).replace(/%LANG%/g, Utils.appLocale);
   },
 
   yield: function()
   {
   }
 };