Merge release into esr68. a=merge
FIREFOX_68_0esr_BUILD1
Merge release into esr68. a=merge
--- a/browser/components/urlbar/tests/browser/browser_inputHistory_emptystring.js
+++ b/browser/components/urlbar/tests/browser/browser_inputHistory_emptystring.js
@@ -79,33 +79,13 @@ add_task(async function test_history_no_
async () => {
info("Test opening panel with history dropmarker on a page");
let selectedBrowser = gBrowser.selectedBrowser;
await BrowserTestUtils.loadURI(selectedBrowser, TEST_URL);
await BrowserTestUtils.browserLoaded(selectedBrowser);
UrlbarTestUtils.getDropMarker(window).click();
return true;
},
- // The following tests must be the last to run because of the pref change.
- async () => {
- info("Test opening panel on focus");
- Services.prefs.setBoolPref("browser.urlbar.openViewOnFocus", true);
- gURLBar.blur();
- EventUtils.synthesizeMouseAtCenter(gURLBar.textbox, {});
- registerCleanupFunction(() => {
- Services.prefs.clearUserPref("browser.urlbar.openViewOnFocus");
- });
- return UrlbarPrefs.get("quantumbar");
- },
- async () => {
- info("Test opening panel on focus on a page");
- let selectedBrowser = gBrowser.selectedBrowser;
- await BrowserTestUtils.loadURI(selectedBrowser, TEST_URL);
- await BrowserTestUtils.browserLoaded(selectedBrowser);
- gURLBar.blur();
- EventUtils.synthesizeMouseAtCenter(gURLBar.textbox, {});
- return UrlbarPrefs.get("quantumbar");
- },
]) {
await do_test(openFn, pickMethod);
}
}
});
--- a/dom/localstorage/test/unit/test_uri_encoding_edge_cases.js
+++ b/dom/localstorage/test/unit/test_uri_encoding_edge_cases.js
@@ -23,16 +23,20 @@ async function testSteps() {
path: "storage/default/file++++test'.html",
},
{
uri: "file:///test>.html",
path: "storage/default/file++++test%3E.html",
},
];
+ info("Setting prefs");
+
+ Services.prefs.setBoolPref("dom.storage.next_gen", true);
+
for (let origin of origins) {
const principal = getPrincipal(origin.uri);
let originDir = getRelativeFile(origin.path);
info("Checking the origin directory existence");
ok(!originDir.exists(),