Bug 1356569 - Remove some more newURI null trailing parameters, rs=Fallen.

2017-11-19 10:54:56 +01:00 · 2017-11-19 10:54:56 +01:00 · 26250d7902
--- a/im/components/devtools/content/webconsole-overlay.xul
+++ b/im/components/devtools/content/webconsole-overlay.xul
@ -18,7 +18,7 @@
            var ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
            Components.classes["@mozilla.org/uriloader/external-protocol-service;1"]
                      .getService(Ci.nsIExternalProtocolService)
-                      .loadURI(ios.newURI(url, null, null), window);
+                      .loadURI(ios.newURI(url), window);
        }
    ]]></script>
  </window>
--- a/im/content/credits.xhtml
+++ b/im/content/credits.xhtml
@ -166,7 +166,7 @@
                        getService(Components.interfaces.nsIIOService);
        Components.classes["@mozilla.org/uriloader/external-protocol-service;1"]
                  .getService(Components.interfaces.nsIExternalProtocolService)
-                  .loadURI(ioService.newURI(aEvent.target.href, null, null));
+                  .loadURI(ioService.newURI(aEvent.target.href));
      }

    ]]>
--- a/mail/components/compose/content/EdColorPropsOverlay.xul
+++ b/mail/components/compose/content/EdColorPropsOverlay.xul
@ -13,7 +13,7 @@
  function onAccept() {
    // If it's a file, convert to a data URL.
    if (gBackgroundImage && /^file:/i.test(gBackgroundImage)) {
-      let nsFile = Services.io.newURI(gBackgroundImage, null, null)
+      let nsFile = Services.io.newURI(gBackgroundImage)
        .QueryInterface(Components.interfaces.nsIFileURL).file;
      if (nsFile.exists()) {
        let reader = new FileReader();
--- a/mail/components/newmailaccount/content/accountProvisioner.js
+++ b/mail/components/newmailaccount/content/accountProvisioner.js
@ -38,7 +38,7 @@ function isAccel (event) { return isOSX && event.metaKey || event.ctrlKey; }
 function getLocalStorage(page) {
  var url = "chrome://content/messenger/accountProvisionerStorage/" + page;

-  var uri = Services.io.newURI(url, "");
+  var uri = Services.io.newURI(url);
  var principal = Services.scriptSecurityManager.createCodebasePrincipal(uri, {});
  return Services.domStorageManager.createStorage(null, principal, url);
 }
--- a/mail/test/mozmill/newmailaccount/test-newmailaccount.js
+++ b/mail/test/mozmill/newmailaccount/test-newmailaccount.js
@ -1206,7 +1206,7 @@ function test_search_button_disabled_if_no_query_on_init() {
  let url = "chrome://content/messenger/accountProvisionerStorage/accountProvisioner";
  let dsm = Services.domStorageManager;

-  let uri = Services.io.newURI(url, "");
+  let uri = Services.io.newURI(url);
  let principal = Services.scriptSecurityManager.createCodebasePrincipal(uri, {});
  let storage = dsm.createStorage(null, principal, url);

--- a/mailnews/compose/content/mailComposeEditorOverlay.xul
+++ b/mailnews/compose/content/mailComposeEditorOverlay.xul
@ -118,7 +118,7 @@
    }

    function GenerateDataURL(url) {
-      var file = Services.io.newURI(url, null, null)
+      var file = Services.io.newURI(url)
        .QueryInterface(Components.interfaces.nsIFileURL).file;
      var contentType = Components.classes["@mozilla.org/mime;1"]
        .getService(Components.interfaces.nsIMIMEService)
--- a/mailnews/compose/test/unit/test_smtpProtocols.js
+++ b/mailnews/compose/test/unit/test_smtpProtocols.js
@ -37,7 +37,7 @@ function run_test() {
      do_check_eq(pH.allowPort(i, ""), (i == protocols[part].defaultPort));

    // Check we get a URI when we ask for one
-    var uri = pH.newURI(protocols[part].urlSpec, "");
+    var uri = pH.newURI(protocols[part].urlSpec);

    uri.QueryInterface(Ci.nsISmtpUrl);

--- a/mailnews/imap/test/unit/test_imapProtocols.js
+++ b/mailnews/imap/test/unit/test_imapProtocols.js
@ -45,7 +45,7 @@ function run_test() {
      do_check_true(pH.allowPort(i, ""));

    // Check we get a URI when we ask for one
-    var uri = pH.newURI(protocols[part].urlSpec, "");
+    var uri = pH.newURI(protocols[part].urlSpec);

    uri.QueryInterface(Ci.nsIImapUrl);

--- a/mailnews/local/test/unit/test_mailboxProtocol.js
+++ b/mailnews/local/test/unit/test_mailboxProtocol.js
@ -36,7 +36,7 @@ function run_test()
      do_check_eq(pH.allowPort(i, ""), false);

    // Check we get a URI when we ask for one
-    var uri = pH.newURI(protocols[part].urlSpec, "");
+    var uri = pH.newURI(protocols[part].urlSpec);

    uri.QueryInterface(Ci.nsIMailboxUrl);

--- a/mailnews/news/test/unit/test_nntpProtocols.js
+++ b/mailnews/news/test/unit/test_nntpProtocols.js
@ -41,7 +41,7 @@ function run_test() {
      do_check_true(pH.allowPort(i, ""));

    // Check we get a URI when we ask for one
-    var uri = pH.newURI(protocols[part].urlSpec, "");
+    var uri = pH.newURI(protocols[part].urlSpec);

    uri.QueryInterface(Ci.nsINntpUrl);

--- a/suite/common/downloads/progressDialog.js
+++ b/suite/common/downloads/progressDialog.js
@ -56,7 +56,7 @@ function progressAsyncStartup(aList) {
  var fSource = document.getElementById("fileSource");
  fName.label = gDownload.displayName;
  fName.tooltipText = gDownload.target.path;
-  var uri = Services.io.newURI(gDownload.source.url, null, null);
+  var uri = Services.io.newURI(gDownload.source.url);
  var fromString;
  try {
    fromString = uri.host;
--- a/suite/common/downloads/tests/chrome/test_action_keys_respect_focus.xul
+++ b/suite/common/downloads/tests/chrome/test_action_keys_respect_focus.xul
@ -180,7 +180,7 @@ function test()
      var ios = Components.classes["@mozilla.org/network/io-service;1"]
                          .getService(Components.interfaces.nsIIOService);
      return (aObj instanceof Components.interfaces.nsIFile) ? ios.newFileURI(aObj) :
-                                            ios.newURI(aObj, null, null);
+                                            ios.newURI(aObj);
    }

    const nsIWBP = Components.interfaces.nsIWebBrowserPersist;
--- a/suite/common/downloads/tests/chrome/test_basic_functionality.xul
+++ b/suite/common/downloads/tests/chrome/test_basic_functionality.xul
@ -203,7 +203,7 @@ function test_properDownloadData(aWin)
    is(view.getCellText(i, colState), stateString,
       "Download states match up");

-    var filePath = ioSvc.newURI(DownloadData[i].target, null, null)
+    var filePath = ioSvc.newURI(DownloadData[i].target)
                        .QueryInterface(Components.interfaces.nsIFileURL)
                        .file.clone()
                        .QueryInterface(Components.interfaces.nsIFile)
--- a/suite/common/downloads/tests/chrome/test_delete_key_cancels.xul
+++ b/suite/common/downloads/tests/chrome/test_delete_key_cancels.xul
@ -127,7 +127,7 @@ function test()
      var ios = Components.classes["@mozilla.org/network/io-service;1"]
                          .getService(Components.interfaces.nsIIOService);
      return (aObj instanceof Components.interfaces.nsIFile) ? ios.newFileURI(aObj) :
-                                            ios.newURI(aObj, null, null);
+                                            ios.newURI(aObj);
    }

    const nsIWBP = Components.interfaces.nsIWebBrowserPersist;
--- a/suite/common/downloads/tests/chrome/test_enter_dblclick_opens.xul
+++ b/suite/common/downloads/tests/chrome/test_enter_dblclick_opens.xul
@ -147,7 +147,7 @@ function test()
      var ios = Components.classes["@mozilla.org/network/io-service;1"]
                          .getService(Components.interfaces.nsIIOService);
      return (aObj instanceof Components.interfaces.nsIFile) ? ios.newFileURI(aObj) :
-                                            ios.newURI(aObj, null, null);
+                                            ios.newURI(aObj);
    }

    const nsIWBP = Components.interfaces.nsIWebBrowserPersist;
--- a/suite/common/downloads/tests/chrome/test_space_key_pauses_resumes.xul
+++ b/suite/common/downloads/tests/chrome/test_space_key_pauses_resumes.xul
@ -147,7 +147,7 @@ function test()
      var ios = Components.classes["@mozilla.org/network/io-service;1"]
                          .getService(Components.interfaces.nsIIOService);
      return (aObj instanceof Components.interfaces.nsIFile) ? ios.newFileURI(aObj) :
-                                            ios.newURI(aObj, null, null);
+                                            ios.newURI(aObj);
    }

    const nsIWBP = Components.interfaces.nsIWebBrowserPersist;
--- a/suite/common/downloads/tests/chrome/test_space_key_retries.xul
+++ b/suite/common/downloads/tests/chrome/test_space_key_retries.xul
@ -125,7 +125,7 @@ function test()
      var ios = Components.classes["@mozilla.org/network/io-service;1"]
                          .getService(Components.interfaces.nsIIOService);
      return (aObj instanceof Components.interfaces.nsIFile) ? ios.newFileURI(aObj) :
-                                            ios.newURI(aObj, null, null);
+                                            ios.newURI(aObj);
    }

    const nsIWBP = Components.interfaces.nsIWebBrowserPersist;
--- a/suite/common/places/tests/chrome/test_bug427633_no_newfolder_if_noip.xul
+++ b/suite/common/places/tests/chrome/test_bug427633_no_newfolder_if_noip.xul
@ -52,7 +52,7 @@
      var ios = Cc["@mozilla.org/network/io-service;1"].
                getService(Ci.nsIIOService);
      function uri(spec) {
-        return ios.newURI(spec, null, null);
+        return ios.newURI(spec);
      }

      // Add a bookmark.
--- a/suite/common/places/tests/chrome/test_bug485100-change-case-loses-tag.xul
+++ b/suite/common/places/tests/chrome/test_bug485100-change-case-loses-tag.xul
@ -49,7 +49,7 @@
      var ios = Cc["@mozilla.org/network/io-service;1"].
                getService(Ci.nsIIOService);
      function uri(spec) {
-        return ios.newURI(spec, null, null);
+        return ios.newURI(spec);
      }

      var testURI = uri("http://www.mozilla.org/");
--- a/suite/common/places/tests/chrome/test_bug549192.xul
+++ b/suite/common/places/tests/chrome/test_bug549192.xul
@ -59,11 +59,11 @@
      let vtime = Date.now() * 1000;
      const ttype = PlacesUtils.history.TRANSITION_TYPED;
      let places =
-        [{ uri: Services.io.newURI("http://example.tld/", null, null),
+        [{ uri: Services.io.newURI("http://example.tld/"),
           visitDate: ++vtime, transition: ttype },
-         { uri: Services.io.newURI("http://example2.tld/", null, null),
+         { uri: Services.io.newURI("http://example2.tld/"),
           visitDate: ++vtime, transition: ttype },
-         { uri: Services.io.newURI("http://example3.tld/", null, null),
+         { uri: Services.io.newURI("http://example3.tld/"),
           visitDate: ++vtime, transition: ttype }];

      addVisits(places, function() {
--- a/suite/common/places/tests/chrome/test_bug549491.xul
+++ b/suite/common/places/tests/chrome/test_bug549491.xul
@ -58,7 +58,7 @@

    function continue_test() {
      addVisits(
-        {uri: Services.io.newURI("http://example.tld/", null, null),
+        {uri: Services.io.newURI("http://example.tld/"),
         visitDate: Date.now() * 1000,
         transition: PlacesUtils.history.TRANSITION_TYPED},
        function() {
--- a/suite/common/places/tests/chrome/test_treeview_date.xul
+++ b/suite/common/places/tests/chrome/test_treeview_date.xul
@ -73,7 +73,7 @@
      var iosvc = Cc["@mozilla.org/network/io-service;1"].
                  getService(Ci.nsIIOService);
      function uri(spec) {
-        return iosvc.newURI(spec, null, null);
+        return iosvc.newURI(spec);
      }

      var midnight = new Date();