Bug 1847787 - Pocket newtab sponsored topsites enabled by default r=nanj,webdriver-reviewers,whimboo

Differential Revision: https://phabricator.services.mozilla.com/D185694

browser/app/profile/firefox.js

@@ -1653,7 +1653,7 @@ pref("browser.newtabpage.activity-stream.discoverystream.essentialReadsHeader.en
 pref("browser.newtabpage.activity-stream.discoverystream.recentSaves.enabled", false);
 pref("browser.newtabpage.activity-stream.discoverystream.editorsPicksHeader.enabled", false);
 pref("browser.newtabpage.activity-stream.discoverystream.spoc-positions", "1,5,7,11,18,20");
-pref("browser.newtabpage.activity-stream.discoverystream.spoc-topsites-positions", "1");
+pref("browser.newtabpage.activity-stream.discoverystream.spoc-topsites-positions", "2");
 pref("browser.newtabpage.activity-stream.discoverystream.widget-positions", "");
 
 pref("browser.newtabpage.activity-stream.discoverystream.spocs-endpoint", "");

browser/components/newtab/lib/DiscoveryStreamFeed.jsm

@@ -2209,7 +2209,7 @@ getHardcodedLayout = ({
   spocPositions = [1, 5, 7, 11, 18, 20],
   spocTopsitesPositions = [1],
   spocPlacementData = { ad_types: [3617], zone_ids: [217758, 217995] },
-  spocTopsitesPlacementData,
+  spocTopsitesPlacementData = { ad_types: [3120], zone_ids: [280143] },
   widgetPositions = [],
   widgetData = [],
   sponsoredCollectionsEnabled = false,

browser/components/newtab/test/browser/browser_newtab_ping.js

@@ -66,7 +66,8 @@ add_task(async function test_newtab_tab_close_sends_ping() {
     );
     Assert.ok(Glean.newtabSearch.enabled.testGetValue());
     Assert.ok(Glean.topsites.enabled.testGetValue());
-    Assert.ok(Glean.topsites.sponsoredEnabled.testGetValue());
+    // Sponsored topsites are turned off in tests to avoid making remote requests.
+    Assert.ok(!Glean.topsites.sponsoredEnabled.testGetValue());
     Assert.ok(Glean.pocket.enabled.testGetValue());
     Assert.ok(Glean.pocket.sponsoredStoriesEnabled.testGetValue());
     Assert.equal(false, Glean.pocket.isSignedIn.testGetValue());
@@ -124,7 +125,8 @@ add_task(async function test_newtab_tab_nav_sends_ping() {
     );
     Assert.ok(Glean.newtabSearch.enabled.testGetValue());
     Assert.ok(Glean.topsites.enabled.testGetValue());
-    Assert.ok(Glean.topsites.sponsoredEnabled.testGetValue());
+    // Sponsored topsites are turned off in tests to avoid making remote requests.
+    Assert.ok(!Glean.topsites.sponsoredEnabled.testGetValue());
     Assert.ok(Glean.pocket.enabled.testGetValue());
     Assert.ok(Glean.pocket.sponsoredStoriesEnabled.testGetValue());
     Assert.equal(false, Glean.pocket.isSignedIn.testGetValue());

remote/shared/RecommendedPreferences.sys.mjs

@@ -105,6 +105,9 @@ const COMMON_PREFERENCES = new Map([
   // inconsistently.
   ["browser.download.panel.shown", true],
 
+  // Make sure Topsites doesn't hit the network to retrieve sponsored tiles.
+  ["browser.newtabpage.activity-stream.showSponsoredTopSites", false],
+
   // Always display a blank page
   ["browser.newtabpage.enabled", false],
 

testing/marionette/client/marionette_driver/geckoinstance.py

@@ -41,6 +41,8 @@ class GeckoInstance(object):
         # and causing false-positive test failures. See bug 1176798, bug 1177018,
         # bug 1210465.
         "apz.content_response_timeout": 60000,
+        # Don't pull sponsored Top Sites content from the network
+        "browser.newtabpage.activity-stream.showSponsoredTopSites": False,
         # Disable geolocation ping (#1)
         "browser.region.network.url": "",
         # Don't pull Top Sites content from the network

testing/profiles/common/user.js

@@ -77,6 +77,8 @@ user_pref("browser.region.network.url", "");
 user_pref("browser.tabs.unloadOnLowMemory", false);
 // Don't pull Top Sites content from the network
 user_pref("browser.topsites.contile.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. Docs:
 // https://firefox-source-docs.mozilla.org/toolkit/components/glean/dev/preferences.html
 user_pref("telemetry.fog.test.localhost_port", -1);

testing/profiles/xpcshell/user.js

@@ -33,5 +33,7 @@ user_pref("gfx.color_management.force_srgb", true);
 user_pref("gfx.color_management.mode", 1);
 // Don't enable remote tiles on new-tab pages in xpcshell
 user_pref("browser.topsites.contile.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);
 user_pref("preferences.force-disable.check.once.policy", true);