From b6de359332fc057632e93ab02fc3b5f2324b9729 Mon Sep 17 00:00:00 2001
From: Jorg K <jorgk@jorgk.com>
Date: Sun, 23 Dec 2018 15:18:37 +0100
Subject: [PATCH] Bug 1515992 - change account provisioner's dummy URL for
 storage to be compatible with NGLS. r=mkmelin,BenB

---
 mail/app/profile/all-thunderbird.js                   |  3 ---
 .../newmailaccount/content/accountProvisioner.js      | 11 ++++-------
 .../mozmill/newmailaccount/test-newmailaccount.js     |  2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/mail/app/profile/all-thunderbird.js b/mail/app/profile/all-thunderbird.js
index c531637e74..183a5228b0 100644
--- a/mail/app/profile/all-thunderbird.js
+++ b/mail/app/profile/all-thunderbird.js
@@ -450,9 +450,6 @@ pref("browser.safebrowsing.reportPhishURL", "https://%LOCALE%.phish-report.mozil
 // prevent status-bar spoofing even if people are foolish enough to turn on JS
 pref("dom.disable_window_status_change",          true);
 
-// Disable Next Generation Local Storage Implementation, see bug 1515992.
-pref("dom.storage.next_gen", false);
-
 // If a message is opened using Enter or a double click, what should we do?
 // 0 - open it in a new window
 // 1 - open it in an existing window
diff --git a/mail/components/newmailaccount/content/accountProvisioner.js b/mail/components/newmailaccount/content/accountProvisioner.js
index f5e7a10209..83f3375584 100644
--- a/mail/components/newmailaccount/content/accountProvisioner.js
+++ b/mail/components/newmailaccount/content/accountProvisioner.js
@@ -24,16 +24,13 @@ function isAccel(event) {
 }
 
 /**
- * Get the localstorage for this page in a way that works in chrome.
- *
- * Cribbed from
- *   mozilla/dom/tests/mochitest/localstorage/test_localStorageFromChrome.xhtml
+ * Get fixed localstorage.
  *
  * @param {String} page The page to get the localstorage for.
  * @return {nsIDOMStorage} The localstorage for this page.
  */
-function getLocalStorage(page) {
-  var url = "chrome://content/messenger/accountProvisionerStorage/" + page;
+function getLocalStorage() {
+  var url = "https://accountprovisioner.thunderbird.invalid";
 
   var uri = Services.io.newURI(url);
   var principal = Services.scriptSecurityManager.createCodebasePrincipal(uri, {});
@@ -1009,7 +1006,7 @@ var EmailAccountProvisioner = {
 
 
 XPCOMUtils.defineLazyGetter(EmailAccountProvisioner, "storage", function() {
-  return getLocalStorage("accountProvisioner");
+  return getLocalStorage();
 });
 
 window.addEventListener("online",
diff --git a/mail/test/mozmill/newmailaccount/test-newmailaccount.js b/mail/test/mozmill/newmailaccount/test-newmailaccount.js
index cfa6e3e3b1..8d3cfe5c5b 100644
--- a/mail/test/mozmill/newmailaccount/test-newmailaccount.js
+++ b/mail/test/mozmill/newmailaccount/test-newmailaccount.js
@@ -1201,7 +1201,7 @@ function subtest_provider_language_wildcard(aController) {
 function test_search_button_disabled_if_no_query_on_init() {
   // We have to do a little bit of gymnastics to access the local storage
   // for the accountProvisioner dialog...
-  let url = "chrome://content/messenger/accountProvisionerStorage/accountProvisioner";
+  let url = "https://accountprovisioner.thunderbird.invalid";
   let dsm = Services.domStorageManager;
 
   let uri = Services.io.newURI(url);