Commit ba0f0d25 authored by Alex Catarineu's avatar Alex Catarineu Committed by Matthew Finkel
Browse files

Bug 31740: Remove some unnecessary RemoteSettings instances

More concretely, SearchService.jsm 'hijack-blocklists' and
url-classifier-skip-urls.

Avoid creating instance for 'anti-tracking-url-decoration'.

If prefs are disabling their usage, avoid creating instances for
'cert-revocations' and 'intermediates'.

Do not ship JSON dumps for collections we do not expect to need. For
the ones in the 'main' bucket, this prevents them from being synced
unnecessarily (the code in remote-settings does so for collections
in the main bucket for which a dump or local data exists). For the
collections in the other buckets, we just save some size by not
shipping their dumps.

We also clear the collections database on the v2 -> v3 migration.
parent cc9f05a9
......@@ -149,6 +149,9 @@ pref("extensions.fxmonitor.enabled", false);
pref("signon.management.page.mobileAndroidURL", "");
pref("signon.management.page.mobileAppleURL", "");
// Disable remote "password recipes"
pref("signon.recipes.remoteRecipesEnabled", false);
// Disable ServiceWorkers and push notifications by default
pref("dom.serviceWorkers.enabled", false);
pref("dom.push.enabled", false);
......
......@@ -89,13 +89,7 @@ class TelemetryHandler {
return;
}
this._telemetrySettings = RemoteSettings(TELEMETRY_SETTINGS_KEY);
let rawProviderInfo = [];
try {
rawProviderInfo = await this._telemetrySettings.get();
} catch (ex) {
logConsole.error("Could not get settings:", ex);
}
// Send the provider info to the child handler.
this._contentHandler.init(rawProviderInfo);
......
......@@ -78,7 +78,7 @@ void UrlClassifierFeatureBase::InitializePreferences() {
nsCOMPtr<nsIUrlClassifierExceptionListService> exceptionListService =
do_GetService("@mozilla.org/url-classifier/exception-list-service;1");
if (NS_WARN_IF(!exceptionListService)) {
if (!exceptionListService) {
return;
}
......
......@@ -13,10 +13,4 @@ Classes = [
'constructor': 'mozilla::net::ChannelClassifierService::GetSingleton',
'headers': ['mozilla/net/ChannelClassifierService.h'],
},
{
'cid': '{b9f4fd03-9d87-4bfd-9958-85a821750ddc}',
'contract_ids': ['@mozilla.org/url-classifier/exception-list-service;1'],
'jsm': 'resource://gre/modules/UrlClassifierExceptionListService.jsm',
'constructor': 'UrlClassifierExceptionListService',
},
]
......@@ -366,6 +366,16 @@ var RemoteSecuritySettings = {
class IntermediatePreloads {
constructor() {
this.maybeInit();
}
maybeInit() {
if (
this.client ||
!Services.prefs.getBoolPref(INTERMEDIATES_ENABLED_PREF, true)
) {
return;
}
this.client = RemoteSettings(
Services.prefs.getCharPref(INTERMEDIATES_COLLECTION_PREF),
{
......@@ -395,6 +405,7 @@ class IntermediatePreloads {
);
return;
}
this.maybeInit();
// Download attachments that are awaiting download, up to a max.
const maxDownloadsPerRun = Services.prefs.getIntPref(
......@@ -705,6 +716,16 @@ function compareFilters(filterA, filterB) {
class CRLiteFilters {
constructor() {
this.maybeInit();
}
maybeInit() {
if (
this.client ||
!Services.prefs.getBoolPref(CRLITE_FILTERS_ENABLED_PREF, true)
) {
return;
}
this.client = RemoteSettings(
Services.prefs.getCharPref(CRLITE_FILTERS_COLLECTION_PREF),
{
......@@ -732,6 +753,8 @@ class CRLiteFilters {
return;
}
this.maybeInit();
let hasPriorFilter = await hasPriorData(
Ci.nsICertStorage.DATA_TYPE_CRLITE_FILTER_FULL
);
......
......@@ -188,6 +188,10 @@ async function openIDB(allowUpgrades = true) {
});
}
if (event.oldVersion < 3) {
// Clear existing stores for a fresh start
transaction.objectStore("records").clear();
transaction.objectStore("timestamps").clear();
transaction.objectStore("collections").clear();
// Attachment store
db.createObjectStore("attachments", {
keyPath: ["cid", "attachmentId"],
......
......@@ -10,7 +10,6 @@ with Files("**"):
# The addons blocklist is also in mobile/android/installer/package-manifest.in
FINAL_TARGET_FILES.defaults.settings.blocklists += [
"addons-bloomfilters.json",
"addons.json",
"gfx.json",
"plugins.json",
]
......
......@@ -3,17 +3,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
FINAL_TARGET_FILES.defaults.settings.main += [
"anti-tracking-url-decoration.json",
"example.json",
"hijack-blocklists.json",
"language-dictionaries.json",
"password-recipes.json",
"search-config.json",
"search-default-override-allowlist.json",
"search-telemetry.json",
"sites-classification.json",
"top-sites.json",
"url-classifier-skip-urls.json",
]
if CONFIG["MOZ_BUILD_APP"] == "browser":
......
......@@ -3,7 +3,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
FINAL_TARGET_FILES.defaults.settings["security-state"] += [
"intermediates.json",
"onecrl.json",
]
......
category profile-after-change URLDecorationAnnotationsService @mozilla.org/tracking-url-decoration-service;1 process=main
# category profile-after-change URLDecorationAnnotationsService @mozilla.org/tracking-url-decoration-service;1 process=main
......@@ -11,13 +11,6 @@ Classes = [
'jsm': 'resource://gre/modules/TrackingDBService.jsm',
'constructor': 'TrackingDBService',
},
{
'cid': '{5874af6d-5719-4e1b-b155-ef4eae7fcb32}',
'contract_ids': ['@mozilla.org/tracking-url-decoration-service;1'],
'jsm': 'resource://gre/modules/URLDecorationAnnotationsService.jsm',
'constructor': 'URLDecorationAnnotationsService',
'processes': ProcessSelector.MAIN_PROCESS_ONLY,
},
{
'cid': '{90d1fd17-2018-4e16-b73c-a04a26fa6dd4}',
'contract_ids': ['@mozilla.org/purge-tracker-service;1'],
......
......@@ -251,8 +251,6 @@ SearchService.prototype = {
// See if we have a settings file so we don't have to parse a bunch of XML.
let settings = await this._settings.get();
this._setupRemoteSettings().catch(Cu.reportError);
await this._loadEngines(settings);
// If we've got this far, but the application is now shutting down,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment