--- a/toolkit/components/search/tests/xpcshell/test_location_timeout.js+++ b/toolkit/components/search/tests/xpcshell/test_location_timeout.js@@ -43,17 +43,17 @@ function run_test() { ok(!Services.prefs.prefHasUserValue("browser.search.countryCode"), "should be no countryCode pref"); ok(!Services.prefs.prefHasUserValue("browser.search.region"), "should be no region pref"); // should be no result recorded at all. checkCountryResultTelemetry(null); // should have set the flag indicating we saw a timeout. let histogram = Services.telemetry.getHistogramById("SEARCH_SERVICE_COUNTRY_TIMEOUT"); let snapshot = histogram.snapshot();- deepEqual(snapshot.counts, [0,1,0]);+ deepEqual(snapshot.counts, [0, 1, 0]); // should not yet have SEARCH_SERVICE_COUNTRY_FETCH_TIME_MS recorded as our // test server is still blocked on our promise. equal(getProbeSum("SEARCH_SERVICE_COUNTRY_FETCH_TIME_MS"), 0); waitForSearchNotification("geoip-lookup-xhr-complete").then(() => { // now we *should* have a report of how long the response took even though // it timed out. // The telemetry "sum" will be the actual time in ms - just check it's non-zero.

--- a/toolkit/components/search/tests/xpcshell/test_location_timeout_xhr.js+++ b/toolkit/components/search/tests/xpcshell/test_location_timeout_xhr.js@@ -47,17 +47,17 @@ function run_test() { ok(!Services.prefs.prefHasUserValue("browser.search.countryCode"), "should be no countryCode pref"); ok(!Services.prefs.prefHasUserValue("browser.search.region"), "should be no region pref"); // should be no result recorded at all. checkCountryResultTelemetry(null); // should have set the flag indicating we saw a timeout. let histogram = Services.telemetry.getHistogramById("SEARCH_SERVICE_COUNTRY_TIMEOUT"); let snapshot = histogram.snapshot();- deepEqual(snapshot.counts, [0,1,0]);+ deepEqual(snapshot.counts, [0, 1, 0]); // should not have SEARCH_SERVICE_COUNTRY_FETCH_TIME_MS recorded as our // test server is still blocked on our promise. verifyProbeSum("SEARCH_SERVICE_COUNTRY_FETCH_TIME_MS", 0); promiseXHRStarted.then(xhr => { // Set the timeout on the xhr object to an extremely low value, so it // should timeout immediately.

--- a/toolkit/mozapps/downloads/content/downloads.js+++ b/toolkit/mozapps/downloads/content/downloads.js@@ -1275,17 +1275,17 @@ function downloadMatchesSearch(aItem) // we should be using real URLs all the time, but until // bug 239948 is fully fixed, this will do... // // note, this will thrown an exception if the native path // is not valid (for example a native Windows path on a Mac) // see bug #392386 for details function getLocalFileFromNativePathOrUrl(aPathOrUrl) {- if (aPathOrUrl.substring(0,7) == "file://") {+ if (aPathOrUrl.substring(0, 7) == "file://") { // if this is a URL, get the file from that let ioSvc = Cc["@mozilla.org/network/io-service;1"]. getService(Ci.nsIIOService); // XXX it's possible that using a null char-set here is bad const fileUrl = ioSvc.newURI(aPathOrUrl, null, null). QueryInterface(Ci.nsIFileURL); return fileUrl.file.clone().QueryInterface(Ci.nsILocalFile);