Adding upstream version 1:115.7.0.upstream/1%115.7.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 22 insertions, 0 deletions

diff --git a/browser/base/content/test/favicons/browser_subframe_favicons_not_used.js b/browser/base/content/test/favicons/browser_subframe_favicons_not_used.js
new file mode 100644
index 0000000000..ff48bcd475
--- /dev/null
+++ b/browser/base/content/test/favicons/browser_subframe_favicons_not_used.js
@@ -0,0 +1,22 @@
+/* Make sure <link rel="..."> isn't respected in sub-frames. */
+
+add_task(async function () {
+  const ROOT =
+    "http://mochi.test:8888/browser/browser/base/content/test/favicons/";
+  const URL = ROOT + "file_bug970276_popup1.html";
+
+  let promiseIcon = waitForFaviconMessage(
+    true,
+    ROOT + "file_bug970276_favicon1.ico"
+  );
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, URL);
+  let icon = await promiseIcon;
+
+  Assert.equal(
+    icon.iconURL,
+    ROOT + "file_bug970276_favicon1.ico",
+    "The expected icon has been set"
+  );
+
+  BrowserTestUtils.removeTab(tab);
+});