Merging upstream version 125.0.1.

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

13 files changed, 273 insertions, 77 deletions

diff --git a/toolkit/components/places/tests/browser/browser.toml b/toolkit/components/places/tests/browser/browser.toml
index 022b929240..b7d688c980 100644
--- a/toolkit/components/places/tests/browser/browser.toml
+++ b/toolkit/components/places/tests/browser/browser.toml
@@ -44,6 +44,8 @@ support-files = [
   "redirect_twice.sjs",
 ]
 
+["browser_favicon.js"]
+
 ["browser_favicon_privatebrowsing_perwindowpb.js"]
 
 ["browser_history_post.js"]
@@ -94,9 +96,11 @@ support-files = [
 https_first_disabled = true
 support-files = [
   "begin.html",
+  "favicon.html",
   "final.html",
   "redirect_once.sjs",
   "redirect_twice.sjs",
+  "userpass.html",
 ]
 
 ["browser_visituri_nohistory.js"]
diff --git a/toolkit/components/places/tests/browser/browser_double_redirect.js b/toolkit/components/places/tests/browser/browser_double_redirect.js
index 435bd86f19..d5b2fca1fe 100644
--- a/toolkit/components/places/tests/browser/browser_double_redirect.js
+++ b/toolkit/components/places/tests/browser/browser_double_redirect.js
@@ -16,7 +16,7 @@ add_task(async function () {
   let promiseVisits = new Promise(resolve => {
     let observer = {
       _notified: [],
-      onVisit(uri, id, time, referrerId, transition) {
+      onVisit(uri) {
         info("Received onVisit: " + uri);
         this._notified.push(uri);
 
diff --git a/toolkit/components/places/tests/browser/browser_favicon.js b/toolkit/components/places/tests/browser/browser_favicon.js
new file mode 100644
index 0000000000..9b4a1b97fe
--- /dev/null
+++ b/toolkit/components/places/tests/browser/browser_favicon.js
@@ -0,0 +1,74 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+  PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
+});
+
+const { MockRegistrar } = ChromeUtils.importESModule(
+  "resource://testing-common/MockRegistrar.sys.mjs"
+);
+
+add_task(async function test_userpass() {
+  // Setup the prompt to avoid showing it.
+  let mockPromptService = {
+    firstTimeCalled: false,
+    confirmExBC() {
+      if (!this.firstTimeCalled) {
+        this.firstTimeCalled = true;
+        return 0;
+      }
+
+      return 1;
+    },
+    QueryInterface: ChromeUtils.generateQI(["nsIPromptService"]),
+  };
+  let mockPromptServiceCID = MockRegistrar.register(
+    "@mozilla.org/prompter;1",
+    mockPromptService
+  );
+  registerCleanupFunction(() => {
+    MockRegistrar.unregister(mockPromptServiceCID);
+  });
+
+  const pageUrl =
+    "https://user:pass@example.org/tests/toolkit/components/places/tests/browser/favicon.html";
+  const faviconUrl =
+    "https://user:pass@example.org/tests/toolkit/components/places/tests/browser/favicon-normal32.png";
+  const exposableFaviconUrl =
+    "https://example.org/tests/toolkit/components/places/tests/browser/favicon-normal32.png";
+
+  let faviconPromise = lazy.PlacesTestUtils.waitForNotification(
+    "favicon-changed",
+    async () => {
+      let faviconForExposable = await lazy.PlacesTestUtils.getDatabaseValue(
+        "moz_icons",
+        "icon_url",
+        {
+          icon_url: exposableFaviconUrl,
+        }
+      );
+      Assert.ok(faviconForExposable, "Found the icon for exposable URL");
+
+      let faviconForOriginal = await lazy.PlacesTestUtils.getDatabaseValue(
+        "moz_icons",
+        "icon_url",
+        {
+          icon_url: faviconUrl,
+        }
+      );
+      Assert.ok(!faviconForOriginal, "Not found the icon for the original URL");
+      return true;
+    }
+  );
+
+  await BrowserTestUtils.openNewForegroundTab(gBrowser, pageUrl);
+  await faviconPromise;
+
+  // Clean up.
+  await PlacesUtils.history.clear();
+  gBrowser.removeCurrentTab();
+});
diff --git a/toolkit/components/places/tests/browser/browser_favicon_privatebrowsing_perwindowpb.js b/toolkit/components/places/tests/browser/browser_favicon_privatebrowsing_perwindowpb.js
index ab3e0a1ef1..090fe802ab 100644
--- a/toolkit/components/places/tests/browser/browser_favicon_privatebrowsing_perwindowpb.js
+++ b/toolkit/components/places/tests/browser/browser_favicon_privatebrowsing_perwindowpb.js
@@ -36,7 +36,7 @@ function test() {
     waitForTabLoad(win, function () {
       PlacesUtils.favicons.getFaviconURLForPage(
         NetUtil.newURI(pageURI),
-        function (uri, dataLen, data, mimeType) {
+        function (uri) {
           is(uri, null, "No result should be found");
           finish();
         }
diff --git a/toolkit/components/places/tests/browser/browser_history_post.js b/toolkit/components/places/tests/browser/browser_history_post.js
index a62592516f..dad988a624 100644
--- a/toolkit/components/places/tests/browser/browser_history_post.js
+++ b/toolkit/components/places/tests/browser/browser_history_post.js
@@ -12,7 +12,7 @@ add_task(async function () {
         let doc = content.document;
         let submit = doc.getElementById("submit");
         let iframe = doc.getElementById("post_iframe");
-        let p = new Promise((resolve, reject) => {
+        let p = new Promise(resolve => {
           iframe.addEventListener(
             "load",
             function () {
diff --git a/toolkit/components/places/tests/browser/browser_notfound.js b/toolkit/components/places/tests/browser/browser_notfound.js
index 22ac67de0a..84e4f2ab9b 100644
--- a/toolkit/components/places/tests/browser/browser_notfound.js
+++ b/toolkit/components/places/tests/browser/browser_notfound.js
@@ -23,7 +23,7 @@ add_task(async function () {
       gBrowser,
       url,
     },
-    async browser => {
+    async () => {
       info("awaiting for the visit");
       await promiseVisited;
 
diff --git a/toolkit/components/places/tests/browser/browser_redirect_self.js b/toolkit/components/places/tests/browser/browser_redirect_self.js
index 7ed7ee0af0..3f14cf4f7c 100644
--- a/toolkit/components/places/tests/browser/browser_redirect_self.js
+++ b/toolkit/components/places/tests/browser/browser_redirect_self.js
@@ -37,7 +37,7 @@ add_task(async function () {
       gBrowser,
       url,
     },
-    async browser => {
+    async () => {
       await TestUtils.waitForCondition(() => visitCount == 2);
       // Check that the visit is not hidden in the database.
       Assert.ok(
diff --git a/toolkit/components/places/tests/browser/browser_visited_notfound.js b/toolkit/components/places/tests/browser/browser_visited_notfound.js
index 36d1764361..ca0638481b 100644
--- a/toolkit/components/places/tests/browser/browser_visited_notfound.js
+++ b/toolkit/components/places/tests/browser/browser_visited_notfound.js
@@ -29,7 +29,7 @@ add_task(async function test() {
       gBrowser,
       url,
     },
-    async browser => {
+    async () => {
       info("awaiting for the visit");
 
       Assert.equal(
diff --git a/toolkit/components/places/tests/browser/browser_visituri.js b/toolkit/components/places/tests/browser/browser_visituri.js
index 6633ac188b..529c010e63 100644
--- a/toolkit/components/places/tests/browser/browser_visituri.js
+++ b/toolkit/components/places/tests/browser/browser_visituri.js
@@ -1,86 +1,78 @@
-/**
- * One-time observer callback.
- */
-function promiseObserve(name, checkFn) {
-  return new Promise(resolve => {
-    Services.obs.addObserver(function observer(subject) {
-      if (checkFn(subject)) {
-        Services.obs.removeObserver(observer, name);
-        resolve();
-      }
-    }, name);
-  });
-}
-
-var conn = PlacesUtils.history.DBConnection;
-
-/**
- * Gets a single column value from either the places or historyvisits table.
- */
-function getColumn(table, column, fromColumnName, fromColumnValue) {
-  let sql = `SELECT ${column}
-             FROM ${table}
-             WHERE ${fromColumnName} = :val
-             ${fromColumnName == "url" ? "AND url_hash = hash(:val)" : ""}
-             LIMIT 1`;
-  let stmt = conn.createStatement(sql);
-  try {
-    stmt.params.val = fromColumnValue;
-    ok(stmt.executeStep(), "Expect to get a row");
-    return stmt.row[column];
-  } finally {
-    stmt.reset();
-  }
-}
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
 
-add_task(async function () {
+const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+  PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
+  TestUtils: "resource://testing-common/TestUtils.sys.mjs",
+});
+
+add_task(async function test_basic() {
   // Make sure places visit chains are saved correctly with a redirect
   // transitions.
 
   // Part 1: observe history events that fire when a visit occurs.
   // Make sure visits appear in order, and that the visit chain is correct.
-  var expectedUrls = [
+  const expectedUrls = [
     "http://example.com/tests/toolkit/components/places/tests/browser/begin.html",
     "http://example.com/tests/toolkit/components/places/tests/browser/redirect_twice.sjs",
     "http://example.com/tests/toolkit/components/places/tests/browser/redirect_once.sjs",
     "http://test1.example.com/tests/toolkit/components/places/tests/browser/final.html",
   ];
-  var currentIndex = 0;
-
-  function checkObserver(subject) {
-    var uri = subject.QueryInterface(Ci.nsIURI);
-    var expected = expectedUrls[currentIndex];
-    is(uri.spec, expected, "Saved URL visit " + uri.spec);
-
-    var placeId = getColumn("moz_places", "id", "url", uri.spec);
-    var fromVisitId = getColumn(
-      "moz_historyvisits",
-      "from_visit",
-      "place_id",
-      placeId
-    );
 
-    if (currentIndex == 0) {
-      is(fromVisitId, 0, "First visit has no from visit");
-    } else {
-      var lastVisitId = getColumn(
-        "moz_historyvisits",
-        "place_id",
+  let currentIndex = 0;
+  let visitUriPromise = lazy.TestUtils.topicObserved(
+    "uri-visit-saved",
+    async subject => {
+      let uri = subject.QueryInterface(Ci.nsIURI);
+      let expected = expectedUrls[currentIndex];
+      is(uri.spec, expected, "Saved URL visit " + uri.spec);
+
+      let placeId = await lazy.PlacesTestUtils.getDatabaseValue(
+        "moz_places",
         "id",
-        fromVisitId
+        {
+          url: uri.spec,
+        }
       );
-      var fromVisitUrl = getColumn("moz_places", "url", "id", lastVisitId);
-      is(
-        fromVisitUrl,
-        expectedUrls[currentIndex - 1],
-        "From visit was " + expectedUrls[currentIndex - 1]
+      let fromVisitId = await lazy.PlacesTestUtils.getDatabaseValue(
+        "moz_historyvisits",
+        "from_visit",
+        {
+          place_id: placeId,
+        }
       );
-    }
 
-    currentIndex++;
-    return currentIndex >= expectedUrls.length;
-  }
-  let visitUriPromise = promiseObserve("uri-visit-saved", checkObserver);
+      if (currentIndex == 0) {
+        is(fromVisitId, 0, "First visit has no from visit");
+      } else {
+        let lastVisitId = await lazy.PlacesTestUtils.getDatabaseValue(
+          "moz_historyvisits",
+          "place_id",
+          {
+            id: fromVisitId,
+          }
+        );
+        let fromVisitUrl = await lazy.PlacesTestUtils.getDatabaseValue(
+          "moz_places",
+          "url",
+          {
+            id: lastVisitId,
+          }
+        );
+        is(
+          fromVisitUrl,
+          expectedUrls[currentIndex - 1],
+          "From visit was " + expectedUrls[currentIndex - 1]
+        );
+      }
+
+      currentIndex++;
+      return currentIndex >= expectedUrls.length;
+    }
+  );
 
   const testUrl =
     "http://example.com/tests/toolkit/components/places/tests/browser/begin.html";
@@ -94,7 +86,119 @@ add_task(async function () {
   );
   await visitUriPromise;
 
+  // Clean up.
   await PlacesUtils.history.clear();
+  gBrowser.removeCurrentTab();
+});
+
+add_task(async function test_userpass() {
+  // Avoid showing the auth prompt.
+  await SpecialPowers.pushPrefEnv({
+    set: [["network.auth.confirmAuth.enabled", false]],
+  });
+
+  // Open a html having test links.
+  await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "https://example.org/tests/toolkit/components/places/tests/browser/userpass.html"
+  );
+
+  const clickedUrl =
+    "https://user:pass@example.org/tests/toolkit/components/places/tests/browser/favicon.html";
+  const exposablePageUrl =
+    "https://example.org/tests/toolkit/components/places/tests/browser/favicon.html";
+
+  let visitUriPromise = lazy.TestUtils.topicObserved(
+    "uri-visit-saved",
+    async subject => {
+      let uri = subject.QueryInterface(Ci.nsIURI);
+      if (uri.spec !== exposablePageUrl) {
+        return false;
+      }
 
+      let placeForExposable = await lazy.PlacesTestUtils.getDatabaseValue(
+        "moz_places",
+        "id",
+        {
+          url: exposablePageUrl,
+        }
+      );
+      Assert.ok(placeForExposable, "Found the place for exposable URL");
+
+      let placeForOriginal = await lazy.PlacesTestUtils.getDatabaseValue(
+        "moz_places",
+        "id",
+        {
+          url: clickedUrl,
+        }
+      );
+      Assert.ok(!placeForOriginal, "Not found the place for the original URL");
+
+      return true;
+    }
+  );
+
+  // Open the target link as background.
+  await ContentTask.spawn(gBrowser.selectedBrowser, null, async args => {
+    let link = content.document.getElementById("target-userpass");
+    EventUtils.synthesizeMouseAtCenter(
+      link,
+      {
+        ctrlKey: true,
+        metaKey: true,
+      },
+      content
+    );
+    return link.href;
+  });
+
+  // Wait for fireing visited event.
+  await visitUriPromise;
+
+  // Check the title.
+  await BrowserTestUtils.waitForCondition(async () => {
+    let titleForExposable = await lazy.PlacesTestUtils.getDatabaseValue(
+      "moz_places",
+      "title",
+      {
+        url: exposablePageUrl,
+      }
+    );
+    return titleForExposable == "favicon page";
+  }, "Wait for the proper title is updated");
+
+  // Check the link status.
+  const expectedResults = {
+    "target-userpass": true,
+    "no-userpass": true,
+    "another-userpass": false,
+    "another-url": false,
+  };
+
+  for (const [key, value] of Object.entries(expectedResults)) {
+    await ContentTask.spawn(
+      gBrowser.selectedBrowser,
+      [key, value],
+      async ([k, v]) => {
+        // ElementState::VISITED
+        const VISITED_STATE = 1 << 18;
+        await ContentTaskUtils.waitForCondition(() => {
+          const isVisited = !!(
+            content.InspectorUtils.getContentState(
+              content.document.getElementById(k)
+            ) & VISITED_STATE
+          );
+          return isVisited == v;
+        });
+      }
+    );
+    Assert.ok(true, `The status of ${key} is correct`);
+  }
+
+  // Clean up.
+  await PlacesUtils.history.clear();
+  // Remove the tab for userpass.html
+  gBrowser.removeCurrentTab();
+  // Remove the tab for favicon.html
   gBrowser.removeCurrentTab();
 });
diff --git a/toolkit/components/places/tests/browser/browser_visituri_privatebrowsing_perwindowpb.js b/toolkit/components/places/tests/browser/browser_visituri_privatebrowsing_perwindowpb.js
index 746611d2ad..2d170115f6 100644
--- a/toolkit/components/places/tests/browser/browser_visituri_privatebrowsing_perwindowpb.js
+++ b/toolkit/components/places/tests/browser/browser_visituri_privatebrowsing_perwindowpb.js
@@ -13,7 +13,7 @@ var visitSavedPromise;
 add_setup(async function () {
   visitSavedPromise = new Promise(resolve => {
     observer = {
-      observe(subject, topic, data) {
+      observe(subject, topic) {
         // The uri-visit-saved topic should only work when on normal mode.
         if (topic == "uri-visit-saved") {
           Services.obs.removeObserver(observer, "uri-visit-saved");
diff --git a/toolkit/components/places/tests/browser/favicon.html b/toolkit/components/places/tests/browser/favicon.html
index a0f5ea9594..789d0b89b8 100644
--- a/toolkit/components/places/tests/browser/favicon.html
+++ b/toolkit/components/places/tests/browser/favicon.html
@@ -5,9 +5,10 @@
 
 <html>
   <head>
-    <link rel="shortcut icon" href="http://example.org/tests/toolkit/components/places/tests/browser/favicon-normal32.png">
+    <link rel="shortcut icon" href="/tests/toolkit/components/places/tests/browser/favicon-normal32.png">
+    <title>favicon page</title>
   </head>
   <body>
-    OK we're done!
+    <label>OK we're done!</label>
   </body>
 </html>
diff --git a/toolkit/components/places/tests/browser/previews/browser.toml b/toolkit/components/places/tests/browser/previews/browser.toml
index 10758a4803..f7f2c9b583 100644
--- a/toolkit/components/places/tests/browser/previews/browser.toml
+++ b/toolkit/components/places/tests/browser/previews/browser.toml
@@ -2,7 +2,7 @@
 prefs = [
   "browser.pagethumbnails.capturing_disabled=false",
   "places.previews.enabled=true",
-  "places.previews.log=true",
+  "places.loglevel='All'",
 ]
 
 ["browser_thumbnails.js"]
diff --git a/toolkit/components/places/tests/browser/userpass.html b/toolkit/components/places/tests/browser/userpass.html
new file mode 100644
index 0000000000..ceff388b79
--- /dev/null
+++ b/toolkit/components/places/tests/browser/userpass.html
@@ -0,0 +1,13 @@
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+   -->
+
+<html>
+  <body>
+    <a href="https://user:pass@example.org/tests/toolkit/components/places/tests/browser/favicon.html" id="target-userpass">target userpass</a>
+    <a href="https://user2:pass2@example.org/tests/toolkit/components/places/tests/browser/favicon.html" id="another-userpass">another userpass</a>
+    <a href="https://example.org/tests/toolkit/components/places/tests/browser/favicon.html" id="no-userpass">no userpass</a>
+    <a href="https://example.org/" id="another-url">another url</a>
+  </body>
+</html>