Bug 1167603 - use string to replace nsIURI in aApps.widgetPages. r=fabrice

--HG--
extra : rebase_source : 360a7a7bf40a3c5753342d333f90ee12d9d1bca2

dom/apps/AppsUtils.jsm

@@ -66,7 +66,8 @@ mozIApplication.prototype = {
     let uri = Services.io.newURI(aPageURL, null, null);
     let filepath = AppsUtils.getFilePath(uri.path);
     let eliminatedUri = Services.io.newURI(uri.prePath + filepath, null, null);
-    let equalCriterion = aUri => aUri.equals(eliminatedUri);
+    let equalCriterion = aUrl => Services.io.newURI(aUrl, null, null)
+                                            .equals(eliminatedUri);
     return this.widgetPages.find(equalCriterion) !== undefined;
   },
 

dom/apps/Webapps.jsm

@@ -396,7 +396,7 @@ this.DOMApplicationRegistry = {
     if (aManifest.widgetPages) {
       let resolve = (aPage)=>{
         let filepath = AppsUtils.getFilePath(aPage);
-        return Services.io.newURI(aManifest.resolveURL(filepath), null, null);
+        return aManifest.resolveURL(filepath);
       };
       aDestApp.widgetPages = aManifest.widgetPages.map(resolve);
     } else {

dom/apps/tests/unit/test_has_widget_criterion.js

@@ -13,7 +13,7 @@ add_test(function test_has_widget_criterion() {
   let resolve = (aPage)=>{
     let filepath = AppsUtils.getFilePath(aPage);
 
-    return Services.io.newURI(baseUri.resolve(filepath), null, null);
+    return baseUri.resolve(filepath);
   };
 
   let widgetPages = ['/widget.html',