Bug 1789406 - Remove brand.dtd files as unused. r=flod,geckoview-reviewers,owlish

After the preceding changes, brand.dtd has no more actual users and may be removed. One mochitest is switched to use a different DTD file which will still remain in the tree. The dependency in aboutSupport.xhtml appears to have been accidentally left in when its localization was migrated to Fluent. Differential Revision: https://phabricator.services.mozilla.com/D156668
2022-10-07 18:40:28 +00:00 · 2022-10-07 18:40:28 +00:00 · 1662ea09fa
--- a/browser/branding/aurora/locales/en-US/brand.dtd
+++ b/browser/branding/aurora/locales/en-US/brand.dtd
@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY  brandShortName        "Firefox Developer Edition">
--- a/browser/branding/aurora/locales/jar.mn
+++ b/browser/branding/aurora/locales/jar.mn
@ -9,5 +9,4 @@
@AB_CD@.jar:
 % locale branding @AB_CD@ %locale/branding/
 # Aurora branding only exists in en-US
-  locale/branding/brand.dtd        (en-US/brand.dtd)
  locale/branding/brand.properties (en-US/brand.properties)
--- a/browser/branding/nightly/locales/en-US/brand.dtd
+++ b/browser/branding/nightly/locales/en-US/brand.dtd
@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY  brandShortName        "Nightly">
--- a/browser/branding/nightly/locales/jar.mn
+++ b/browser/branding/nightly/locales/jar.mn
@ -9,5 +9,4 @@
@AB_CD@.jar:
 % locale branding @AB_CD@ %locale/branding/
 # Nightly branding only exists in en-US
-  locale/branding/brand.dtd        (en-US/brand.dtd)
  locale/branding/brand.properties (en-US/brand.properties)
--- a/browser/branding/official/locales/en-US/brand.dtd
+++ b/browser/branding/official/locales/en-US/brand.dtd
@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY  brandShortName        "Firefox">
--- a/browser/branding/official/locales/jar.mn
+++ b/browser/branding/official/locales/jar.mn
@ -8,5 +8,4 @@

@AB_CD@.jar:
 % locale branding @AB_CD@ %locale/branding/
-  locale/branding/brand.dtd        (%brand.dtd)
  locale/branding/brand.properties (%brand.properties)
--- a/browser/branding/unofficial/locales/en-US/brand.dtd
+++ b/browser/branding/unofficial/locales/en-US/brand.dtd
@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY  brandShortName        "Nightly">
--- a/browser/branding/unofficial/locales/jar.mn
+++ b/browser/branding/unofficial/locales/jar.mn
@ -9,5 +9,4 @@
@AB_CD@.jar:
 % locale branding @AB_CD@ %locale/branding/
 # Unofficial branding only exists in en-US
-  locale/branding/brand.dtd        (en-US/brand.dtd)
  locale/branding/brand.properties (en-US/brand.properties)
--- a/dom/tests/mochitest/bugs/test_bug467035.html
+++ b/dom/tests/mochitest/bugs/test_bug467035.html
@ -13,11 +13,11 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=467035
  /** Test for Bug 467035 **/
  SimpleTest.waitForExplicitFinish();
  addLoadEvent(() => {
-    const s = `<!DOCTYPE html SYSTEM \"chrome://branding/locale/brand.dtd\">
+    const s = `<!DOCTYPE html SYSTEM \"chrome://global/locale/notification.dtd\">
      <html xmlns=\"http://www.w3.org/1999/xhtml\">
        <head>
          <meta charset=\"utf-8\"/>
-          <title>&brandShortName;</title>
+          <title>&closeNotification.tooltip;</title>
        </head>
      </html>`;

--- a/mobile/android/branding/beta/locales/en-US/brand.dtd
+++ b/mobile/android/branding/beta/locales/en-US/brand.dtd
@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY  brandShortName  "Firefox Beta">
--- a/mobile/android/branding/beta/locales/jar.mn
+++ b/mobile/android/branding/beta/locales/jar.mn
@ -9,5 +9,4 @@
@AB_CD@.jar:
 % locale branding @AB_CD@ %locale/branding/
 # Branding only exists in en-US
-  locale/branding/brand.dtd        (en-US/brand.dtd)
  locale/branding/brand.properties (en-US/brand.properties)
--- a/mobile/android/branding/nightly/locales/en-US/brand.dtd
+++ b/mobile/android/branding/nightly/locales/en-US/brand.dtd
@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY  brandShortName  "Nightly">
--- a/mobile/android/branding/nightly/locales/jar.mn
+++ b/mobile/android/branding/nightly/locales/jar.mn
@ -9,5 +9,4 @@
@AB_CD@.jar:
 % locale branding @AB_CD@ %locale/branding/
 # Nightly branding only exists in en-US
-  locale/branding/brand.dtd        (en-US/brand.dtd)
  locale/branding/brand.properties (en-US/brand.properties)
--- a/mobile/android/branding/official/locales/en-US/brand.dtd
+++ b/mobile/android/branding/official/locales/en-US/brand.dtd
@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY  brandShortName  "Firefox">
--- a/mobile/android/branding/official/locales/jar.mn
+++ b/mobile/android/branding/official/locales/jar.mn
@ -9,5 +9,4 @@
@AB_CD@.jar:
 % locale branding @AB_CD@ %locale/branding/
 # Branding only exists in en-US
-  locale/branding/brand.dtd        (en-US/brand.dtd)
  locale/branding/brand.properties (en-US/brand.properties)
--- a/mobile/android/branding/unofficial/locales/en-US/brand.dtd
+++ b/mobile/android/branding/unofficial/locales/en-US/brand.dtd
@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY  brandShortName  "Fennec">
--- a/mobile/android/branding/unofficial/locales/jar.mn
+++ b/mobile/android/branding/unofficial/locales/jar.mn
@ -9,5 +9,4 @@
@AB_CD@.jar:
 % locale branding @AB_CD@ %locale/branding/
 # Nightly branding only exists in en-US
-  locale/branding/brand.dtd        (en-US/brand.dtd)
  locale/branding/brand.properties (en-US/brand.properties)
--- a/toolkit/content/aboutSupport.xhtml
+++ b/toolkit/content/aboutSupport.xhtml
@ -6,7 +6,6 @@

 <!DOCTYPE html [
  <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> %htmlDTD;
-  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> %brandDTD;
 ]>

 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/toolkit/locales/en-US/chrome/global/notification.dtd
+++ b/toolkit/locales/en-US/chrome/global/notification.dtd
@ -2,8 +2,9 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<!-- This file is only used by the Firefox Translations extension,
-   - and should be removed once possible.
+<!-- This file is only used by the Firefox Translations extension
+   - and by dom/tests/mochitest/bugs/test_bug467035.html.
+   - It should be removed once possible.
   - See: https://bugzilla.mozilla.org/show_bug.cgi?id=1788595 -->

 <!ENTITY closeNotification.tooltip "Close this message">