From 36acd51f1ce8194c0c8128ffdbbb1b0a3e286e4d Mon Sep 17 00:00:00 2001 From: Norisz Fay Date: Wed, 29 Nov 2023 01:05:15 +0200 Subject: [PATCH] Backed out changeset 3128a39910aa (bug 1860833) for causing bc failures on browser_opentabs_firefoxview_next.js, browser_feature_callout_targeting.js --- browser/components/firefoxview/syncedtabs.mjs | 2 +- services/sync/modules/SyncedTabs.sys.mjs | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/browser/components/firefoxview/syncedtabs.mjs b/browser/components/firefoxview/syncedtabs.mjs index c6e95c7aa512d..36523c8a2652b 100644 --- a/browser/components/firefoxview/syncedtabs.mjs +++ b/browser/components/firefoxview/syncedtabs.mjs @@ -554,7 +554,7 @@ class SyncedTabsInView extends ViewPage { async getSyncedTabData() { this.devices = await lazy.SyncedTabs.getTabClients(); - let tabs = await lazy.SyncedTabs.createRecentTabsList(this.devices, 50, { + let tabs = await lazy.SyncedTabs.getRecentTabs(50, { removeAllDupes: false, removeDeviceDupes: true, }); diff --git a/services/sync/modules/SyncedTabs.sys.mjs b/services/sync/modules/SyncedTabs.sys.mjs index 1d8139b020d28..b2f96ce3a68a4 100644 --- a/services/sync/modules/SyncedTabs.sys.mjs +++ b/services/sync/modules/SyncedTabs.sys.mjs @@ -300,10 +300,6 @@ export var SyncedTabs = { return this._internal.syncTabs(force); }, - createRecentTabsList(clients, maxCount, extraParams) { - return this._internal._createRecentTabsList(clients, maxCount, extraParams); - }, - sortTabClientsByLastUsed(clients) { // First sort the list of tabs for each client. Note that // this module promises that the objects it returns are never @@ -342,6 +338,6 @@ export var SyncedTabs = { // lastUsed value, and filtered for duplicate URLs async getRecentTabs(maxCount, extraParams) { let clients = await this.getTabClients(); - return this._internal.createRecentTabsList(clients, maxCount, extraParams); + return this._internal._createRecentTabsList(clients, maxCount, extraParams); }, };