From 0ba8bb84b51fa96ef2642bd7a4081b8ccb3d18e3 Mon Sep 17 00:00:00 2001
From: Nathan Barrett <30009669+nathan-barrett@users.noreply.github.com>
Date: Fri, 28 Jun 2024 15:33:02 +0000
Subject: [PATCH] Bug 1899782 - flip wallpaper v2 pref for nightly
 r=home-newtab-reviewers,thecount,webdriver-reviewers,whimboo

Differential Revision: https://phabricator.services.mozilla.com/D214999
---
 browser/app/profile/firefox.js                                | 3 ++-
 .../newtab/test/xpcshell/test_AboutHomeStartupCacheWorker.js  | 4 ++++
 remote/shared/RecommendedPreferences.sys.mjs                  | 1 +
 testing/marionette/client/marionette_driver/geckoinstance.py  | 1 +
 testing/profiles/common/user.js                               | 1 +
 testing/profiles/xpcshell/user.js                             | 1 +
 6 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index e5bf1e7d086a..bca2909d6f92 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1732,10 +1732,11 @@ pref("browser.newtabpage.activity-stream.weather.display", "simple");
 // Preference to enable wallpaper selection in the Customize Menu of new tab page
 #ifdef NIGHTLY_BUILD
   pref("browser.newtabpage.activity-stream.newtabWallpapers.enabled", true);
+  pref("browser.newtabpage.activity-stream.newtabWallpapers.v2.enabled", true);
 #else
+  pref("browser.newtabpage.activity-stream.newtabWallpapers.v2.enabled", false);
   pref("browser.newtabpage.activity-stream.newtabWallpapers.enabled", false);
 #endif
-pref("browser.newtabpage.activity-stream.newtabWallpapers.v2.enabled", false);
 
 // Current new tab page background images.
 pref("browser.newtabpage.activity-stream.newtabWallpapers.wallpaper-light", "");
diff --git a/browser/components/newtab/test/xpcshell/test_AboutHomeStartupCacheWorker.js b/browser/components/newtab/test/xpcshell/test_AboutHomeStartupCacheWorker.js
index 229d29c7c062..f919b9e92b39 100644
--- a/browser/components/newtab/test/xpcshell/test_AboutHomeStartupCacheWorker.js
+++ b/browser/components/newtab/test/xpcshell/test_AboutHomeStartupCacheWorker.js
@@ -85,6 +85,10 @@ add_setup(async function () {
     "browser.newtabpage.activity-stream.newtabWallpapers.enabled",
     false
   );
+  Services.prefs.setBoolPref(
+    "browser.newtabpage.activity-stream.newtabWallpapers.v2.enabled",
+    false
+  );
 
   let defaultDSConfig = JSON.parse(
     PREFS_CONFIG.get("discoverystream.config").getValue({
diff --git a/remote/shared/RecommendedPreferences.sys.mjs b/remote/shared/RecommendedPreferences.sys.mjs
index 6c2af7cd25de..4c66ba4543c1 100644
--- a/remote/shared/RecommendedPreferences.sys.mjs
+++ b/remote/shared/RecommendedPreferences.sys.mjs
@@ -111,6 +111,7 @@ const COMMON_PREFERENCES = new Map([
 
   // Make sure newtab wallpapers don't hit the network to retrieve wallpaper data.
   ["browser.newtabpage.activity-stream.newtabWallpapers.enabled", false],
+  ["browser.newtabpage.activity-stream.newtabWallpapers.v2.enabled", false],
 
   // Make sure Topsites doesn't hit the network to retrieve sponsored tiles.
   ["browser.newtabpage.activity-stream.showSponsoredTopSites", false],
diff --git a/testing/marionette/client/marionette_driver/geckoinstance.py b/testing/marionette/client/marionette_driver/geckoinstance.py
index 1fb2ace297d2..1844f5e71da4 100644
--- a/testing/marionette/client/marionette_driver/geckoinstance.py
+++ b/testing/marionette/client/marionette_driver/geckoinstance.py
@@ -49,6 +49,7 @@ class GeckoInstance(object):
         "browser.newtabpage.activity-stream.discoverystream.region-weather-config": "",
         # Don't pull wallpaper content from the network
         "browser.newtabpage.activity-stream.newtabWallpapers.enabled": False,
+        "browser.newtabpage.activity-stream.newtabWallpapers.v2.enabled": False,
         # Don't pull sponsored Top Sites content from the network
         "browser.newtabpage.activity-stream.showSponsoredTopSites": False,
         # Disable geolocation ping (#1)
diff --git a/testing/profiles/common/user.js b/testing/profiles/common/user.js
index af81b3c540c2..dac431311cfa 100644
--- a/testing/profiles/common/user.js
+++ b/testing/profiles/common/user.js
@@ -77,6 +77,7 @@ user_pref("browser.topsites.contile.enabled", false);
 user_pref("browser.newtabpage.activity-stream.discoverystream.region-weather-config", "");
 // Don't pull wallpaper content from the network
 user_pref("browser.newtabpage.activity-stream.newtabWallpapers.enabled", false);
+user_pref("browser.newtabpage.activity-stream.newtabWallpapers.v2.enabled", false);
 // Don't pull sponsored Top Sites content from the network
 user_pref("browser.newtabpage.activity-stream.showSponsoredTopSites", false);
 // Default Glean to "record but don't report" mode, and to never trigger
diff --git a/testing/profiles/xpcshell/user.js b/testing/profiles/xpcshell/user.js
index 47734e7ff062..9de36d4d4bbf 100644
--- a/testing/profiles/xpcshell/user.js
+++ b/testing/profiles/xpcshell/user.js
@@ -42,6 +42,7 @@ user_pref("browser.topsites.contile.enabled", false);
 user_pref("browser.newtabpage.activity-stream.discoverystream.region-weather-config", "");
 // Don't pull wallpaper content from the network
 user_pref("browser.newtabpage.activity-stream.newtabWallpapers.enabled", false);
+user_pref("browser.newtabpage.activity-stream.newtabWallpapers.v2.enabled", false);
 // Don't pull sponsored Top Sites content from the network
 user_pref("browser.newtabpage.activity-stream.showSponsoredTopSites", false);
 user_pref("security.turn_off_all_security_so_that_viruses_can_take_over_this_computer", true);