fixup! Bug 31740: Remove some unnecessary RemoteSettings instances

Bug 41704: Immediately return on remoteSettings.pollChanges

services/settings/remote-settings.js

@@ -200,12 +200,17 @@ function remoteSettingsFunction() {
     full = false,
   } = {}) => {
     // When running in full mode, we ignore last polling status.
-    if (full) {
+    if (full || AppConstants.BASE_BROWSER_VERSION) {
       gPrefs.clearUserPref(PREF_SETTINGS_SERVER_BACKOFF);
       gPrefs.clearUserPref(PREF_SETTINGS_LAST_UPDATE);
       gPrefs.clearUserPref(PREF_SETTINGS_LAST_ETAG);
     }
 
+    if (AppConstants.BASE_BROWSER_VERSION) {
+      // tor-browser#41704: pollChanges is always online, so do not allow it.
+      return;
+    }
+
     let pollTelemetryArgs = {
       source: TELEMETRY_SOURCE_POLL,
       trigger,

services/settings/servicesSettings.manifest

@@ -4,4 +4,4 @@ resource services-settings resource://gre/modules/services-settings/
 # Schedule polling of remote settings changes
 # (default 24H, max 72H)
 # see syntax https://searchfox.org/mozilla-central/rev/cc280c4be94ff8cf64a27cc9b3d6831ffa49fa45/toolkit/components/timermanager/UpdateTimerManager.jsm#155
-category update-timer RemoteSettingsComponents @mozilla.org/services/settings;1,getService,services-settings-poll-changes,services.settings.poll_interval,86400,259200
+# category update-timer RemoteSettingsComponents @mozilla.org/services/settings;1,getService,services-settings-poll-changes,services.settings.poll_interval,86400,259200