Bug 1502556 - Conditionally add browser.xul instead of browser.xhtml to browser_all_files_referenced.js;r=Gijs
authorBrian Grinstead <bgrinstead@mozilla.com>
Sun, 28 Oct 2018 23:00:58 +0000
changeset 443269 eb4b57c7a3e2c6cca1a124aca117da4eddd2351b
parent 443268 d9b93ea9b5c442c401c50a779af2f3ab7382ffb8
child 443270 627720590ce22dcf92d9ffc0ac3a7ec3d1a45f84
push id34950
push usercsabou@mozilla.com
push dateMon, 29 Oct 2018 04:16:25 +0000
treeherdermozilla-central@d2e24bdf0648 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs
bugs1502556
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1502556 - Conditionally add browser.xul instead of browser.xhtml to browser_all_files_referenced.js;r=Gijs Differential Revision: https://phabricator.services.mozilla.com/D9980
browser/base/content/test/static/browser_all_files_referenced.js
--- a/browser/base/content/test/static/browser_all_files_referenced.js
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -165,17 +165,18 @@ var whitelist = [
   // Bug 1378173 (warning: still used by devtools)
   {file: "resource://gre/modules/Promise.jsm"},
   // Still used by WebIDE, which is going away but not entirely gone.
   {file: "resource://gre/modules/ZipUtils.jsm"},
   // Bug 1463225 (on Mac and Windows this is only used by a test)
   {file: "chrome://global/content/bindings/toolbar.xml",
    platforms: ["macosx", "win"]},
   // Bug 1483277 (temporarily unreferenced)
-  {file: "chrome://browser/content/browser.xhtml"},
+  {file: AppConstants.BROWSER_CHROME_URL == "chrome://browser/content/browser.xul" ?
+    "chrome://browser/content/browser.xhtml" : "chrome://browser/content/browser.xul" },
   // Bug 1494170
   // (The references to these files are dynamically generated, so the test can't
   // find the references)
   {file: "chrome://devtools/skin/images/aboutdebugging-firefox-aurora.svg",
    isFromDevTools: true},
   {file: "chrome://devtools/skin/images/aboutdebugging-firefox-beta.svg",
    isFromDevTools: true},
   {file: "chrome://devtools/skin/images/aboutdebugging-firefox-release.svg",