Merge pull request #33 from Floorp-Projects/sync/nora-0.2.0/upstream-no-version-20260130-115943

sync: no_version_change upstream 147.0.3

Author: Ryosuke-Asano

browser/components/newtab/AboutNewTabRedirector.sys.mjs

@@ -517,17 +517,12 @@ export class AboutNewTabRedirectorParent extends BaseAboutNewTabRedirector {
   }
 
   /**
-   * Returns a Promise that reoslves when the newtab built-in addon has notified
-   * that it has finished initializing. If this is somehow checked when
-   * BROWSER_NEWTAB_AS_ADDON is not true, then this always resolves.
+   * Returns a Promise that resolves when the newtab built-in addon has notified
+   * that it has finished initializing.
    *
    * @type {Promise<undefined>}
    */
   get promiseBuiltInAddonInitialized() {
-    if (!AppConstants.BROWSER_NEWTAB_AS_ADDON) {
-      return Promise.resolve();
-    }
-
     return this.#addonInitializedPromise;
   }
 
@@ -547,7 +542,7 @@ export class AboutNewTabRedirectorParent extends BaseAboutNewTabRedirector {
     );
     resultChannel.originalURI = uri;
 
-    if (AppConstants.BROWSER_NEWTAB_AS_ADDON && !this.#addonInitialized) {
+    if (!this.#addonInitialized) {
       return this.#getSuspendedChannel(resultChannel);
     }
 

browser/components/newtab/test/browser/abouthomecache/browser_no_startup_actions.js

@@ -40,7 +40,7 @@ add_task(async function test_no_startup_actions() {
     // The following two statements seem to be enough to simulate Activity
     // Stream starting up.
     AboutNewTab.activityStream.uninit();
-    AboutNewTab.onBrowserReady();
+    await AboutNewTab.onBrowserReady();
 
     // Much of Activity Stream initializes asynchronously. This is the easiest way
     // I could find to ensure that enough of the feeds had initialized to produce

browser/components/newtab/test/xpcshell/test_nimbus_newtabTrainhopAddon_onBrowserReady.js

@@ -35,7 +35,7 @@ add_task(
     const { nimbusFeatureCleanup } = await setupNimbusTrainhopAddon({
       updateAddonVersion,
     });
-    AboutNewTab.onBrowserReady();
+    await AboutNewTab.onBrowserReady();
     await promiseInstallPostponed;
     const { pendingInstall } = await asyncAssertNimbusTrainhopAddonStaged({
       updateAddonVersion,

browser/components/preferences/privacy.js

@@ -3573,21 +3573,6 @@ var gPrivacyPane = {
 
     setSyncFromPrefListener("savePasswords", () => this.readSavePasswords());
 
-    if (AlertsServiceDND) {
-      let notificationsDoNotDisturbBox = document.getElementById(
-        "notificationsDoNotDisturbBox"
-      );
-      notificationsDoNotDisturbBox.removeAttribute("hidden");
-      let checkbox = document.getElementById("notificationsDoNotDisturb");
-      document.l10n.setAttributes(checkbox, "permissions-notification-pause");
-      if (AlertsServiceDND.manualDoNotDisturb) {
-        let notificationsDoNotDisturb = document.getElementById(
-          "notificationsDoNotDisturb"
-        );
-        notificationsDoNotDisturb.setAttribute("checked", true);
-      }
-    }
-
     this.initSiteDataControls();
 
     this.initCookieBannerHandling();

browser/extensions/moz.configure

@@ -1,3 +1 @@
-set_config("BROWSER_NEWTAB_AS_ADDON", True)
-set_define("BROWSER_NEWTAB_AS_ADDON", True)
 set_config("MOZ_JAR_MAKER_FILE_FORMAT", "jar")

browser/extensions/newtab/legacy-jar.mn

@@ -1439,6 +1439,12 @@ export const PREFS_CONFIG = new Map([
 
 // Array of each feed's FEEDS_CONFIG factory and values to add to PREFS_CONFIG
 const FEEDS_DATA = [
+  {
+    name: "startupcacheinit",
+    factory: () => new lazy.StartupCacheInit(),
+    title: "Sends a copy of the state to the startup cache newtab",
+    value: true,
+  },
   {
     name: "aboutpreferences",
     factory: () => new lazy.AboutPreferences(),
@@ -1469,12 +1475,6 @@ const FEEDS_DATA = [
     title: "Manages sections",
     value: true,
   },
-  {
-    name: "startupcacheinit",
-    factory: () => new lazy.StartupCacheInit(),
-    title: "Sends a copy of the state to the startup cache newtab",
-    value: true,
-  },
   {
     name: "section.highlights",
     factory: () => new lazy.HighlightsFeed(),
@@ -1639,14 +1639,30 @@ for (const config of FEEDS_DATA) {
 }
 
 export class ActivityStream {
+  #createdInstant = null;
+
   /**
    * constructor - Initializes an instance of ActivityStream
+   *
+   * @param {Temporal.Instant} [createdInstant=null]
+   *   The creation time of the current user profile.
    */
-  constructor() {
+  constructor(createdInstant) {
     this.initialized = false;
     this.store = new lazy.Store();
     this._defaultPrefs = new lazy.DefaultPrefs(PREFS_CONFIG);
     this._proxyRegistered = false;
+    this.#createdInstant = createdInstant ?? null;
+  }
+
+  /**
+   * Returns a Temporal.Instant for when the user profile was created, or null
+   * if that value was never passed to us in the constructor.
+   *
+   * @type {Temporal.Instant}
+   */
+  get createdInstant() {
+    return this.#createdInstant;
   }
 
   get feeds() {

browser/extensions/newtab/lib/ActivityStream.sys.mjs

@@ -19,8 +19,6 @@ XPCSHELL_TESTS_MANIFESTS += [
     "test/xpcshell/xpcshell.toml",
 ]
 
-if CONFIG["BROWSER_NEWTAB_AS_ADDON"]:
-    JAR_MANIFESTS += ["addon-jar.mn"]
-    DIRS += ["webext-glue"]
-else:
-    JAR_MANIFESTS += ["legacy-jar.mn"]
+JAR_MANIFESTS += ["addon-jar.mn"]
+
+DIRS += ["webext-glue"]

browser/extensions/newtab/moz.build

@@ -77,10 +77,8 @@ add_setup(async function head_initialize() {
   );
   await AddonTestUtils.promiseStartupManager();
 
-  if (AppConstants.BROWSER_NEWTAB_AS_ADDON) {
-    Services.prefs.setBoolPref("extensions.experiments.enabled", true);
-    await loadExtension();
-  }
+  Services.prefs.setBoolPref("extensions.experiments.enabled", true);
+  await loadExtension();
   AboutNewTab.init();
 });
 

browser/extensions/newtab/test/xpcshell/head.js

@@ -18,6 +18,9 @@ const { TestUtils } = ChromeUtils.importESModule(
 const { sinon } = ChromeUtils.importESModule(
   "resource://testing-common/Sinon.sys.mjs"
 );
+const { NimbusTestUtils } = ChromeUtils.importESModule(
+  "resource://testing-common/NimbusTestUtils.sys.mjs"
+);
 
 SearchTestUtils.init(this);
 
@@ -34,6 +37,8 @@ ChromeUtils.defineESModuleGetters(this, {
 const CACHE_WORKER_URL = "resource://newtab/lib/cache.worker.js";
 const NEWTAB_RENDER_URL = "resource://newtab/data/content/newtab-render.js";
 
+NimbusTestUtils.init(this);
+
 /**
  * In order to make this test less brittle, much of Activity Stream is
  * initialized here in order to generate a state object at runtime, rather
@@ -111,9 +116,12 @@ add_setup(async function () {
     { setAsDefault: true }
   );
 
+  const { cleanup: nimbusTestCleanup } = await NimbusTestUtils.setupTest();
+  registerCleanupFunction(nimbusTestCleanup);
+
   // Pretend that a new window has been loaded to kick off initializing all of
   // the feeds.
-  AboutNewTab.onBrowserReady();
+  await AboutNewTab.onBrowserReady();
 
   // Much of Activity Stream initializes asynchronously. This is the easiest way
   // I could find to ensure that enough of the feeds had initialized to produce