tor-browser

commit f077deaade2d2bd1dafd3647a59bdaf7ff1ee4db
parent f4356205c44be7a4716666bd1cdcce86d3d48641
Author: Atila Butkovits <abutkovits@mozilla.com>
Date:   Fri, 19 Dec 2025 00:14:02 +0200

Revert "Bug 2004773 - Enable image proxy for newtab r=mconley,home-newtab-reviewers,necko-reviewers,valentin,sessionstore-reviewers,urlbar-reviewers,jteow,sthompson" for causing failures at test_rel_preconnect.html.

This reverts commit d7e949fc3321dac3ffaf646e9291df903ea1fd0f.

Diffstat:
M
browser/app/profile/firefox.js
 | 
2
+-
M
browser/components/sessionstore/test/browser_speculative_connect.js
 | 
11
-----------
M
browser/components/urlbar/tests/browser/browser_speculative_connect.js
 | 
5
-----
M
netwerk/test/browser/browser_link_hover_speculative_connection.js
 | 
5
-----
M
netwerk/test/browser/browser_speculative_connection_link_header.js
 | 
8
--------

5 files changed, 1 insertion(+), 30 deletions(-)
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
@@ -2037,7 +2037,7 @@ pref("browser.newtabpage.activity-stream.discoverystream.merino-provider.endpoin
 pref("browser.newtabpage.activity-stream.discoverystream.merino-provider.ohttp.enabled", false);
 pref("browser.newtabpage.activity-stream.discoverystream.ohttp.relayURL", "https://mozilla-ohttp.fastly-edge.com/");
 pref("browser.newtabpage.activity-stream.discoverystream.ohttp.configURL", "https://prod.ohttp-gateway.prod.webservices.mozgcp.net/ohttp-configs");
-pref("browser.newtabpage.activity-stream.discoverystream.imageProxy.enabled", true);
+pref("browser.newtabpage.activity-stream.discoverystream.imageProxy.enabled", false);
 
 // List of regions that get spocs by default.
 pref("browser.newtabpage.activity-stream.discoverystream.region-spocs-config", "US,CA,DE,GB,FR,IT,ES");
diff --git a/browser/components/sessionstore/test/browser_speculative_connect.js b/browser/components/sessionstore/test/browser_speculative_connect.js
@@ -4,17 +4,6 @@ const TEST_URLS = [
   "",
 ];
 
-add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      [
-        "browser.newtabpage.activity-stream.discoverystream.imageProxy.enabled",
-        false,
-      ],
-    ],
-  });
-});
-
 /**
  * This will open tabs in browser. This will also make the last tab
  * inserted to be the selected tab.
diff --git a/browser/components/urlbar/tests/browser/browser_speculative_connect.js b/browser/components/urlbar/tests/browser/browser_speculative_connect.js
@@ -28,11 +28,6 @@ add_setup(async function () {
       // The http server is using IPv4, so it's better to disable IPv6 to avoid
       // weird networking problem.
       ["network.dns.disableIPv6", true],
-      // disable image proxy for newtab until Bug #2005048 is fixed
-      [
-        "browser.newtabpage.activity-stream.discoverystream.imageProxy.enabled",
-        false,
-      ],
     ],
   });
 
diff --git a/netwerk/test/browser/browser_link_hover_speculative_connection.js b/netwerk/test/browser/browser_link_hover_speculative_connection.js
@@ -21,11 +21,6 @@ add_setup(async function () {
       ["network.predictor.enable-hover-on-ssl", true],
       // Enable network debugging observations
       ["network.http.debug-observations", true],
-      // disable image proxy for newtab until Bug #2005048 is fixed
-      [
-        "browser.newtabpage.activity-stream.discoverystream.imageProxy.enabled",
-        false,
-      ],
     ],
   });
 
diff --git a/netwerk/test/browser/browser_speculative_connection_link_header.js b/netwerk/test/browser/browser_speculative_connection_link_header.js
@@ -3,17 +3,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Services.prefs.setBoolPref("network.http.debug-observations", true);
-// disable image proxy for newtab until Bug #2005048 is fixed
-Services.prefs.setBoolPref(
-  "browser.newtabpage.activity-stream.discoverystream.imageProxy.enabled",
-  false
-);
 
 registerCleanupFunction(function () {
   Services.prefs.clearUserPref("network.http.debug-observations");
-  Services.prefs.clearUserPref(
-    "browser.newtabpage.activity-stream.discoverystream.imageProxy.enabled"
-  );
 });
 
 // Test steps: