Merge release into esr68. a=merge FIREFOX_68_0esr_BUILD1
authorJulien Cristau <jcristau@mozilla.com>
Thu, 04 Jul 2019 19:29:01 +0200 (2019-07-04)
changeset 522798 debdf96baee1d54d22415ca3981179264d342c47
parent 522797 193ba9b220195042a62c1ab7eb18a70e0c2712f8 (current diff)
parent 522796 3a52b315fac071bbcc8b644c79181e4366330fd9 (diff)
child 522799 e592ba3eb0b88b0e87a1caa22f8ace6ad5db3432
push id40
push userjcristau@mozilla.com
push dateThu, 04 Jul 2019 17:36:30 +0000 (2019-07-04)
treeherdermozilla-esr68@debdf96baee1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone68.0
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(),