Backed out changeset 8a21200047bb (bug 1651012) for causing bc failures in browser_parsable_script.js

CLOSED TREE

browser/base/content/aboutNetError.xhtml

@@ -208,9 +208,9 @@
       </div>
     </div>
   </body>
-  <script src="chrome://browser/content/certerror/aboutNetErrorCodes.js"/>
+  <script src="chrome://browser/content/aboutNetErrorCodes.js"/>
   <script src="chrome://global/content/certviewer/pvutils_bundle.js"></script>
   <script src="chrome://global/content/certviewer/asn1js_bundle.js"></script>
   <script src="chrome://global/content/certviewer/pkijs_bundle.js"></script>
-  <script type="module" src="chrome://browser/content/certerror/aboutNetError.js"/>
+  <script type="module" src="chrome://browser/content/aboutNetError.js"/>
 </html>

browser/base/jar.mn

@@ -23,9 +23,9 @@ browser.jar:
         content/browser/logos/tracking-protection-dark-theme.svg (content/logos/tracking-protection-dark-theme.svg)
         content/browser/logos/vpn-dark.svg            (content/logos/vpn-dark.svg)
         content/browser/logos/vpn-light.svg           (content/logos/vpn-light.svg)
-        content/browser/certerror/aboutNetErrorCodes.js (content/certerror/aboutNetErrorCodes.js)
-        content/browser/certerror/aboutNetError.xhtml (content/certerror/aboutNetError.xhtml)
-        content/browser/certerror/aboutNetError.js    (content/certerror/aboutNetError.js)
+        content/browser/aboutNetErrorCodes.js         (content/aboutNetErrorCodes.js)
+        content/browser/aboutNetError.xhtml            (content/aboutNetError.xhtml)
+        content/browser/aboutNetError.js               (content/aboutNetError.js)
         content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
         content/browser/aboutFrameCrashed.html        (content/aboutFrameCrashed.html)
         content/browser/aboutTabCrashed.css           (content/aboutTabCrashed.css)
@@ -122,7 +122,7 @@ browser.jar:
         content/browser/upgradeDialog.html            (content/upgradeDialog.html)
         content/browser/upgradeDialog.js              (content/upgradeDialog.js)
 
-% override chrome://global/content/netError.xhtml chrome://browser/content/certerror/aboutNetError.xhtml
+% override chrome://global/content/netError.xhtml chrome://browser/content/aboutNetError.xhtml
 
 # L10n resources and overrides.
 % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties

browser/base/moz.build

@@ -84,7 +84,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] in ("windows", "gtk"):
 JAR_MANIFESTS += ["jar.mn"]
 
 GeneratedFile(
-    "content/certerror/aboutNetErrorCodes.js",
-    script="content/certerror/gen_aboutneterror_codes.py",
+    "content/aboutNetErrorCodes.js",
+    script="gen_aboutneterror_codes.py",
     inputs=["/browser/locales/en-US/browser/nsserrors.ftl"],
 )

browser/components/about/AboutRedirector.cpp

@@ -52,7 +52,7 @@ static const RedirEntry kRedirMap[] = {
      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
          nsIAboutModule::URI_CAN_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |
          nsIAboutModule::HIDE_FROM_ABOUTABOUT},
-    {"certerror", "chrome://browser/content/certerror/aboutNetError.xhtml",
+    {"certerror", "chrome://browser/content/aboutNetError.xhtml",
      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
          nsIAboutModule::URI_CAN_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |
          nsIAboutModule::HIDE_FROM_ABOUTABOUT},

dom/security/DOMSecurityMonitor.cpp

@@ -54,7 +54,7 @@ void DOMSecurityMonitor::AuditParsingOfHTMLXMLFragments(
       "chrome://global/content/elements/marquee.js"_ns,
       nsLiteralCString(
           "chrome://pocket/content/panels/js/vendor/jquery-2.1.1.min.js"),
-      "chrome://browser/content/certerror/aboutNetError.js"_ns,
+      "chrome://browser/content/aboutNetError.js"_ns,
       nsLiteralCString("chrome://devtools/content/shared/sourceeditor/"
                        "codemirror/codemirror.bundle.js"),
       nsLiteralCString(

python/mozbuild/mozbuild/test/codecoverage/test_lcov_rewrite.py

@@ -314,7 +314,7 @@ class TestUrlFinder(unittest.TestCase):
                 ],
             },
             {
-                "chrome://global/content/netError.xhtml": "chrome://browser/content/certerror/aboutNetError.xhtml",  # NOQA: E501
+                "chrome://global/content/netError.xhtml": "chrome://browser/content/aboutNetError.xhtml",  # NOQA: E501
             },
             {
                 "dist/bin/components/MainProcessSingleton.js": ["path1", None],
@@ -330,8 +330,8 @@ class TestUrlFinder(unittest.TestCase):
                     "browser/components/newtab/lib/*",
                     None,
                 ],
-                "dist/bin/browser/chrome/browser/content/browser/certerror/aboutNetError.xhtml": [
-                    "browser/base/content/certerror/aboutNetError.xhtml",
+                "dist/bin/browser/chrome/browser/content/browser/aboutNetError.xhtml": [
+                    "browser/base/content/aboutNetError.xhtml",
                     None,
                 ],
                 "dist/bin/modules/AppConstants.jsm": [
@@ -403,7 +403,7 @@ class TestUrlFinder(unittest.TestCase):
             # Path which is in url overrides
             (
                 "chrome://global/content/netError.xhtml",
-                ("browser/base/content/certerror/aboutNetError.xhtml", None),
+                ("browser/base/content/aboutNetError.xhtml", None),
             ),
             # Path which ends with > eval
             (