Backed out changeset 3b0d32c48d6b (bug 1925823) for causing mochitest failures @ browser.toml

amarc-mozilla · amarc-mozilla · commit aa24629baee3 · 2025-02-03T18:06:06.000+02:00
diff --git a/browser/base/content/test/contextMenu/browser_contextmenu.js b/browser/base/content/test/contextMenu/browser_contextmenu.js
@@ -72,6 +72,7 @@ add_setup(async function () {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.search.separatePrivateDefault.ui.enabled", true],
+      ["extensions.screenshots.disabled", false],
       ["privacy.query_stripping.strip_on_share.canDisable", false],
     ],
   });
diff --git a/browser/base/content/test/contextMenu/browser_contextmenu_input.js b/browser/base/content/test/contextMenu/browser_contextmenu_input.js
@@ -298,10 +298,6 @@ add_task(
           null,
           "---",
           null,
-          "context-take-screenshot",
-          true,
-          "---",
-          null,
           "context-viewsource",
           true,
         ],
diff --git a/browser/base/content/test/performance/browser.toml b/browser/base/content/test/performance/browser.toml
@@ -17,6 +17,9 @@ prefs = [
   # For perfomance tests do not enable the remote control cue, which gets set
   # when Marionette is enabled, but users normally don't see.
   "browser.chrome.disableRemoteControlCueForTests=true",
+  # The Screenshots extension is disabled by default in Mochitests. We re-enable
+  # it here, since it's a more realistic configuration.
+  "extensions.screenshots.disabled=false",
   # Need to keep the revamped sidebar off until Bug 1905212 is done
   "sidebar.revamp=false",
 ]
diff --git a/browser/base/content/test/performance/io/browser.toml b/browser/base/content/test/performance/io/browser.toml
@@ -14,6 +14,7 @@ skip-if = [
 prefs = [
   "browser.startup.record=true",
   "gfx.canvas.willReadFrequently.enable=true",
+  "extensions.screenshots.disabled=false", # The Screenshots extension is disabled by default in Mochitests. We re-enable it here, since it's a more realistic configuration.
 ]
 environment = [
   "GNOME_ACCESSIBILITY=0",
diff --git a/browser/components/customizableui/test/browser.toml b/browser/components/customizableui/test/browser.toml
@@ -341,7 +341,6 @@ skip-if = ["(verify && debug && (os == 'linux' || os == 'mac'))"]
 ["browser_reset_dom_events.js"]
 
 ["browser_screenshot_button_disabled.js"]
-prefs = ["extensions.screenshots.disabled=true"]
 
 ["browser_searchbar_removal.js"]
 
diff --git a/browser/components/enterprisepolicies/tests/browser/disable_fxscreenshots/browser.toml b/browser/components/enterprisepolicies/tests/browser/disable_fxscreenshots/browser.toml
@@ -1,6 +1,7 @@
 [DEFAULT]
 prefs = [
   "browser.policies.alternatePath='<test-root>/browser/components/enterprisepolicies/tests/browser/disable_fxscreenshots/config_disable_fxscreenshots.json'",
+  "extensions.screenshots.disabled=false",
 ]
 support-files = ["config_disable_fxscreenshots.json"]
 
diff --git a/browser/components/screenshots/tests/browser/browser.toml b/browser/components/screenshots/tests/browser/browser.toml
@@ -14,6 +14,7 @@ support-files = [
 ]
 
 prefs = [
+  "extensions.screenshots.disabled=false",
   "screenshots.browser.component.enabled=true",
   "sidebar.revamp=false",
 ]
diff --git a/browser/components/screenshots/tests/browser/browserSidebarRevamp.toml b/browser/components/screenshots/tests/browser/browserSidebarRevamp.toml
@@ -14,6 +14,7 @@ support-files = [
 ]
 
 prefs = [
+  "extensions.screenshots.disabled=false",
   "screenshots.browser.component.enabled=true",
   "sidebar.revamp=true",
 ]
diff --git a/browser/components/urlbar/tests/browser/browser.toml b/browser/components/urlbar/tests/browser/browser.toml
@@ -12,6 +12,7 @@ skip-if = [
 prefs = [
   "browser.bookmarks.testing.skipDefaultBookmarksImport=true",
   "browser.urlbar.trending.featureGate=false",
+  "extensions.screenshots.disabled=false",
   "screenshots.browser.component.enabled=true",
   "sidebar.revamp=false",
 ]
diff --git a/browser/components/urlbar/tests/browser/browserSidebarRevamp.toml b/browser/components/urlbar/tests/browser/browserSidebarRevamp.toml
@@ -13,6 +13,7 @@ skip-if = [
 prefs = [
   "browser.bookmarks.testing.skipDefaultBookmarksImport=true",
   "browser.urlbar.trending.featureGate=false",
+  "extensions.screenshots.disabled=false",
   "screenshots.browser.component.enabled=true",
   "sidebar.revamp=true",
 ]
diff --git a/browser/extensions/screenshots/test/browser/browser.toml b/browser/extensions/screenshots/test/browser/browser.toml
@@ -1,5 +1,7 @@
 [DEFAULT]
+# The Screenshots extension is disabled by default in Mochitests. We re-enable it here, since it's a more realistic configuration.
 prefs = [
+ "extensions.screenshots.disabled=false",
  "screenshots.browser.component.enabled=false",
 ]
 
diff --git a/testing/profiles/unittest-required/user.js b/testing/profiles/unittest-required/user.js
@@ -106,6 +106,8 @@ user_pref("extensions.getAddons.search.browseURL", "http://{server}/extensions-d
 user_pref("extensions.hotfix.url", "http://{server}/extensions-dummy/hotfixURL");
 // Disable intalling any distribution add-ons
 user_pref("extensions.installDistroAddons", false);
+// Disable Screenshots by default for now
+user_pref("extensions.screenshots.disabled", true);
 user_pref("extensions.systemAddon.update.url", "http://{server}/dummy-system-addons.xml");
 user_pref("extensions.systemAddon.update.enabled", false);
 user_pref("extensions.update.background.url", "http://{server}/extensions-dummy/updateBackgroundURL");

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ skip-if = [`
`14`	`14`	`prefs = [`
`15`	`15`	`"browser.startup.record=true",`
`16`	`16`	`"gfx.canvas.willReadFrequently.enable=true",`
	`17`	`+ "extensions.screenshots.disabled=false", # The Screenshots extension is disabled by default in Mochitests. We re-enable it here, since it's a more realistic configuration.`
`17`	`18`	`]`
`18`	`19`	`environment = [`
`19`	`20`	`"GNOME_ACCESSIBILITY=0",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`[DEFAULT]`
`2`	`2`	`prefs = [`
`3`	`3`	`"browser.policies.alternatePath='<test-root>/browser/components/enterprisepolicies/tests/browser/disable_fxscreenshots/config_disable_fxscreenshots.json'",`
	`4`	`+ "extensions.screenshots.disabled=false",`
`4`	`5`	`]`
`5`	`6`	`support-files = ["config_disable_fxscreenshots.json"]`
`6`	`7`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ support-files = [`
`14`	`14`	`]`
`15`	`15`
`16`	`16`	`prefs = [`
	`17`	`+ "extensions.screenshots.disabled=false",`
`17`	`18`	`"screenshots.browser.component.enabled=true",`
`18`	`19`	`"sidebar.revamp=false",`
`19`	`20`	`]`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ skip-if = [`
`12`	`12`	`prefs = [`
`13`	`13`	`"browser.bookmarks.testing.skipDefaultBookmarksImport=true",`
`14`	`14`	`"browser.urlbar.trending.featureGate=false",`
	`15`	`+ "extensions.screenshots.disabled=false",`
`15`	`16`	`"screenshots.browser.component.enabled=true",`
`16`	`17`	`"sidebar.revamp=false",`
`17`	`18`	`]`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ skip-if = [`
`13`	`13`	`prefs = [`
`14`	`14`	`"browser.bookmarks.testing.skipDefaultBookmarksImport=true",`
`15`	`15`	`"browser.urlbar.trending.featureGate=false",`
	`16`	`+ "extensions.screenshots.disabled=false",`
`16`	`17`	`"screenshots.browser.component.enabled=true",`
`17`	`18`	`"sidebar.revamp=true",`
`18`	`19`	`]`