From 6bba3e6d42985dc595c84b23458a23fbb6e5df0e Mon Sep 17 00:00:00 2001
From: Sebastian Hengst <archaeopteryx@coole-files.de>
Date: Thu, 21 Sep 2017 22:28:55 +0200
Subject: [PATCH] Backed out changeset e46cfa3b45ff (bug 1347798) because it
 will fail browser-chrome's browser_all_files_referenced.js. r=backout

---
 browser/components/nsBrowserGlue.js | 10 ------
 intl/l10n/Localization.jsm          | 11 -------
 intl/l10n/jar.mn                    |  2 --
 intl/l10n/l10n.js                   | 51 -----------------------------
 intl/l10n/moz.build                 |  2 --
 5 files changed, 76 deletions(-)
 delete mode 100644 intl/l10n/jar.mn
 delete mode 100644 intl/l10n/l10n.js

diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index cd786acf81f1..e865481cbbc3 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -37,10 +37,8 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   ExtensionsUI: "resource:///modules/ExtensionsUI.jsm",
   Feeds: "resource:///modules/Feeds.jsm",
   FileUtils: "resource://gre/modules/FileUtils.jsm",
-  FileSource: "resource://gre/modules/L10nRegistry.jsm",
   FormValidationHandler: "resource:///modules/FormValidationHandler.jsm",
   Integration: "resource://gre/modules/Integration.jsm",
-  L10nRegistry: "resource://gre/modules/L10nRegistry.jsm",
   LightweightThemeManager: "resource://gre/modules/LightweightThemeManager.jsm",
   LoginHelper: "resource://gre/modules/LoginHelper.jsm",
   LoginManagerParent: "resource://gre/modules/LoginManagerParent.jsm",
@@ -632,14 +630,6 @@ BrowserGlue.prototype = {
       });
     }
 
-
-    // Initialize the default l10n resource sources for L10nRegistry.
-    const locales = [AppConstants.INSTALL_LOCALE];
-    const toolkitSource = new FileSource("toolkit", locales, "resource://gre/localization/{locale}/");
-    L10nRegistry.registerSource(toolkitSource);
-    const appSource = new FileSource("app", locales, "resource://app/localization/{locale}/");
-    L10nRegistry.registerSource(appSource);
-
     Services.obs.notifyObservers(null, "browser-ui-startup-complete");
   },
 
diff --git a/intl/l10n/Localization.jsm b/intl/l10n/Localization.jsm
index f12af89d601f..0b02e8172904 100644
--- a/intl/l10n/Localization.jsm
+++ b/intl/l10n/Localization.jsm
@@ -57,17 +57,6 @@ class CachedIterable {
       }
     };
   }
-
-  /**
-   * This method allows user to consume the next element from the iterator
-   * into the cache.
-   */
-  touchNext() {
-    const { seen, iterator } = this;
-    if (seen.length === 0 || seen[seen.length - 1].done === false) {
-      seen.push(iterator.next());
-    }
-  }
 }
 
 /**
diff --git a/intl/l10n/jar.mn b/intl/l10n/jar.mn
deleted file mode 100644
index 2bd7ce1df14a..000000000000
--- a/intl/l10n/jar.mn
+++ /dev/null
@@ -1,2 +0,0 @@
-toolkit.jar:
-  content/global/l10n.js
diff --git a/intl/l10n/l10n.js b/intl/l10n/l10n.js
deleted file mode 100644
index a4e2f0a608b8..000000000000
--- a/intl/l10n/l10n.js
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  const { DOMLocalization } =
-    Components.utils.import("resource://gre/modules/DOMLocalization.jsm");
-
-  /**
-   * Polyfill for document.ready polyfill.
-   * See: https://github.com/whatwg/html/issues/127 for details.
-   *
-   * @returns {Promise}
-   */
-  function documentReady() {
-    const rs = document.readyState;
-    if (rs === 'interactive' || rs === 'completed') {
-      return Promise.resolve();
-    }
-
-    return new Promise(
-      resolve => document.addEventListener(
-        'readystatechange', resolve, { once: true }
-      )
-    );
-  }
-
-  /**
-   * Scans the `elem` for links with localization resources.
-   *
-   * @param {Element} elem
-   * @returns {Array<string>}
-   */
-  function getResourceLinks(elem) {
-    return Array.from(elem.querySelectorAll('link[rel="localization"]')).map(
-      el => el.getAttribute('href')
-    );
-  }
-
-  const resourceIds = getResourceLinks(document.head || document);
-
-  document.l10n = new DOMLocalization(window, resourceIds);
-
-  // trigger first context to be fetched eagerly
-  document.l10n.ctxs.touchNext();
-
-  document.l10n.ready = documentReady().then(() => {
-    document.l10n.registerObservers();
-    window.addEventListener('unload', () => {
-      document.l10n.unregisterObservers();
-    });
-    document.l10n.connectRoot(document.documentElement);
-    return document.l10n.translateRoots();
-  });
-}
diff --git a/intl/l10n/moz.build b/intl/l10n/moz.build
index 344ceb46a30b..ee1a8279c8c6 100644
--- a/intl/l10n/moz.build
+++ b/intl/l10n/moz.build
@@ -15,6 +15,4 @@ XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini']
 
 MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
 
-JAR_MANIFESTS += ['jar.mn']
-
 FINAL_LIBRARY = 'xul'