Bug 1754124 - Filter out expired themes for UITour colorways r=Gijs

Differential Revision: https://phabricator.services.mozilla.com/D138135

browser/components/uitour/UITour.jsm

@@ -16,7 +16,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   AddonManager: "resource://gre/modules/AddonManager.jsm",
   AppConstants: "resource://gre/modules/AppConstants.jsm",
   BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.jsm",
-  BuiltInThemeConfig: "resource:///modules/BuiltInThemeConfig.jsm",
+  BuiltInThemes: "resource:///modules/BuiltInThemes.jsm",
   CustomizableUI: "resource:///modules/CustomizableUI.jsm",
   fxAccounts: "resource://gre/modules/FxAccounts.jsm",
   FxAccounts: "resource://gre/modules/FxAccounts.jsm",
@@ -47,8 +47,9 @@ const MAX_BUTTONS = 4;
 
 // Array of which colorway/theme ids can be activated.
 XPCOMUtils.defineLazyGetter(this, "COLORWAY_IDS", () =>
-  [...BuiltInThemeConfig.keys()].filter(id =>
-    id.endsWith("[email protected]")
+  [...BuiltInThemes.builtInThemeMap.keys()].filter(
+    id =>
+      id.endsWith("[email protected]") && !BuiltInThemes.themeIsExpired(id)
   )
 );
 

browser/components/uitour/test/browser.ini

@@ -32,7 +32,6 @@ skip-if = os == "linux" # Linux: Bug 986760, Bug 989101.
 [browser_UITour_availableTargets.js]
 [browser_UITour_annotation_size_attributes.js]
 [browser_UITour_colorway.js]
-skip-if = true # temporarily disable test in Bug 1754124
 [browser_UITour_defaultBrowser.js]
 [browser_UITour_detach_tab.js]
 [browser_UITour_forceReaderMode.js]