Merge branch 'bookmarks/central' into enterprise-main

Author: Alexandre Lissy

Cargo.lock

@@ -28,6 +28,12 @@ function getMacAccessible(accOrElmOrID) {
   });
 }
 
+add_setup(async function () {
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.urlbar.trustPanel.featureGate", false]],
+  });
+});
+
 /**
  * Test a11yUtils announcements are exposed to VO
  */

accessible/tests/browser/mac/browser_app.js

@@ -424,7 +424,11 @@ pref("browser.urlbar.deduplication.thresholdDays", 0);
 
 pref("browser.urlbar.scotchBonnet.enableOverride", true);
 
+#ifdef NIGHTLY_BUILD
+pref("browser.urlbar.trustPanel.featureGate", true);
+#else
 pref("browser.urlbar.trustPanel.featureGate", false);
+#endif
 
 // Once Perplexity has entered search mode at least once,
 // we no longer show the Perplexity onboarding callout.
@@ -2033,14 +2037,14 @@ pref("browser.newtabpage.activity-stream.discoverystream.region-basic-config", "
 pref("browser.newtabpage.activity-stream.discoverystream.pocket-feed-parameters", "");
 pref("browser.newtabpage.activity-stream.discoverystream.merino-feed-experiment", false);
 
-pref("browser.newtabpage.activity-stream.discoverystream.personalization.enabled", true);
+pref("browser.newtabpage.activity-stream.discoverystream.personalization.enabled", false);
 pref("browser.newtabpage.activity-stream.discoverystream.personalization.override", false);
 // Configurable keys used by personalization.
 pref("browser.newtabpage.activity-stream.discoverystream.personalization.modelKeys", "nb_model_arts_and_entertainment, nb_model_autos_and_vehicles, nb_model_beauty_and_fitness, nb_model_blogging_resources_and_services, nb_model_books_and_literature, nb_model_business_and_industrial, nb_model_computers_and_electronics, nb_model_finance, nb_model_food_and_drink, nb_model_games, nb_model_health, nb_model_hobbies_and_leisure, nb_model_home_and_garden, nb_model_internet_and_telecom, nb_model_jobs_and_education, nb_model_law_and_government, nb_model_online_communities, nb_model_people_and_society, nb_model_pets_and_animals, nb_model_real_estate, nb_model_reference, nb_model_science, nb_model_shopping, nb_model_sports, nb_model_travel");
 // System pref to allow Pocket stories personalization to be turned on/off.
 pref("browser.newtabpage.activity-stream.discoverystream.recs.personalized", false);
 // System pref to allow Pocket sponsored content personalization to be turned on/off.
-pref("browser.newtabpage.activity-stream.discoverystream.spocs.personalized", true);
+pref("browser.newtabpage.activity-stream.discoverystream.spocs.personalized", false);
 
 // List of locales that get thumbs up/down on recommended stories by default.
 pref("browser.newtabpage.activity-stream.discoverystream.thumbsUpDown.locale-thumbs-config", "en-US, en-GB, en-CA");

browser/app/profile/firefox.js

@@ -21,7 +21,10 @@ async function test_blankPage(
   header = "show" // show (zero content-length), hide (no content-length), or lie (non-empty content-length)
 ) {
   await SpecialPowers.pushPrefEnv({
-    set: [["browser.http.blank_page_with_error_response.enabled", false]],
+    set: [
+      ["browser.http.blank_page_with_error_response.enabled", false],
+      ["browser.urlbar.trustPanel.featureGate", false],
+    ],
   });
 
   let browser;

browser/base/content/test/about/browser_aboutNetError_blank_page.js

@@ -9,6 +9,12 @@
 // using the button contained therein to load the certificate exception
 // dialog, using that to add an exception, and finally successfully visiting
 // the site, including showing the right identity box and control center icons.
+add_setup(async function () {
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.urlbar.trustPanel.featureGate", false]],
+  });
+});
+
 add_task(async function () {
   for (let feltPrivacyEnabled of [true, false]) {
     await SpecialPowers.pushPrefEnv({

browser/base/content/test/general/browser_addCertException.js

@@ -123,6 +123,7 @@ add_setup(async function () {
       ["test.wait300msAfterTabSwitch", true],
       // TODO: Reenable in https://bugzilla.mozilla.org/show_bug.cgi?id=1923388
       ["browser.urlbar.scotchBonnet.enableOverride", false],
+      ["browser.urlbar.trustPanel.featureGate", false],
       ["browser.toolbars.keyboard_navigation", true],
       ["accessibility.tabfocus", 7],
       // Taskbar Tabs' page action is controlled by a pref that differs across

browser/base/content/test/keyboard/browser_toolbarKeyNav.js

@@ -2,6 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+add_setup(async function () {
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.urlbar.trustPanel.featureGate", false]],
+  });
+});
+
 add_task(async function test_displayURI_geo() {
   await BrowserTestUtils.withNewTab(
     "https://test1.example.com/",

browser/base/content/test/popupNotifications/browser_popupNotification_hide_after_identity_panel.js

@@ -2,6 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+add_setup(async function () {
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.urlbar.trustPanel.featureGate", false]],
+  });
+});
+
 add_task(async function test_hide_popup_with_protections_panel_showing() {
   await BrowserTestUtils.withNewTab(
     "https://test1.example.com/",

browser/base/content/test/popupNotifications/browser_popupNotification_hide_after_protections_panel.js

@@ -13,6 +13,10 @@ support-files = [
   "trackingPage.html",
 ]
 
+prefs = [
+  "browser.urlbar.trustPanel.featureGate=false"
+]
+
 ["browser_protectionsUI.js"]
 https_first_disabled = true
 

browser/base/content/test/protectionsUI/browser.toml

@@ -5,6 +5,7 @@ support-files = [
   "!/image/test/mochitest/blue.png",
 ]
 prefs = [
+  "browser.urlbar.trustPanel.featureGate=false",
   "security.certerrors.felt-privacy-v1=true"
 ]