Backed out changeset 0ceb86d2fcc1 (bug 1719755) for xpcshell failures on test_AboutHomeStartupCacheWorker.js. CLOSED TREE

browser/app/profile/firefox.js

@@ -1416,7 +1416,7 @@ pref("prompts.defaultModalType", 3);
 
 pref("browser.topsites.useRemoteSetting", true);
 // Fetch sponsored Top Sites from Mozilla Tiles Service (Contile)
-pref("browser.topsites.contile.enabled", true);
+pref("browser.topsites.contile.enabled", false);
 pref("browser.topsites.contile.endpoint", "https://contile.services.mozilla.com/v1/tiles");
 
 // The base URL for the Quick Suggest anonymizing proxy. To make a request to

remote/shared/RecommendedPreferences.jsm

@@ -258,9 +258,6 @@ const COMMON_PREFERENCES = new Map([
 
   // Prevent starting into safe mode after application crashes
   ["toolkit.startup.max_resumed_crashes", -1],
-
-  // Make sure Topsites doesn't hit the network to retrieve tiles from Contile.
-  ["browser.topsites.contile.enabled", false],
 ]);
 
 const RecommendedPreferences = {

testing/marionette/client/marionette_driver/geckoinstance.py

@@ -112,8 +112,6 @@ class GeckoInstance(object):
         "toolkit.startup.max_resumed_crashes": -1,
         # Enabling the support for File object creation in the content process.
         "dom.file.createInChild": True,
-        # Don't pull Top Sites content from the network
-        "browser.topsites.contile.enabled": False,
     }
 
     def __init__(

testing/profiles/common/user.js

@@ -76,5 +76,3 @@ user_pref("geo.provider.network.compare.url", "");
 user_pref("browser.region.network.url", "");
 // Do not unload tabs on low memory when testing
 user_pref("browser.tabs.unloadOnLowMemory", false);
-// Don't pull Top Sites content from the network
-user_pref("browser.topsites.contile.endpoint", "http://localhost/contile-dummy/v1");