commit e1e1f70187dc106628e8e8c58ecbe23976b31131
Author: Alex Catarineu <a...@torproject.org>
Date: Wed Oct 16 23:01:12 2019 +0200
Bug 31740: Remove some unnecessary RemoteSettings instances
More concretely, SearchService.jsm 'hijack-blocklists' and
url-classifier-skip-urls.
---
netwerk/url-classifier/UrlClassifierFeatureBase.cpp | 2 +-
netwerk/url-classifier/components.conf | 6 ------
toolkit/components/search/SearchService.jsm | 2 --
3 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/netwerk/url-classifier/UrlClassifierFeatureBase.cpp
b/netwerk/url-classifier/UrlClassifierFeatureBase.cpp
index 1d344f92c201..1537fd6c6e8e 100644
--- a/netwerk/url-classifier/UrlClassifierFeatureBase.cpp
+++ b/netwerk/url-classifier/UrlClassifierFeatureBase.cpp
@@ -75,7 +75,7 @@ void UrlClassifierFeatureBase::InitializePreferences() {
nsCOMPtr<nsIUrlClassifierSkipListService> skipListService =
do_GetService("@mozilla.org/url-classifier/skip-list-service;1");
- if (NS_WARN_IF(!skipListService)) {
+ if (!skipListService) {
return;
}
diff --git a/netwerk/url-classifier/components.conf
b/netwerk/url-classifier/components.conf
index 6dbd57d4232f..acc3fbd3ae5d 100644
--- a/netwerk/url-classifier/components.conf
+++ b/netwerk/url-classifier/components.conf
@@ -5,10 +5,4 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
Classes = [
- {
- 'cid': '{b9f4fd03-9d87-4bfd-9958-85a821750ddc}',
- 'contract_ids': ['@mozilla.org/url-classifier/skip-list-service;1'],
- 'jsm': 'resource://gre/modules/UrlClassifierSkipListService.jsm',
- 'constructor': 'UrlClassifierSkipListService',
- },
]
diff --git a/toolkit/components/search/SearchService.jsm
b/toolkit/components/search/SearchService.jsm
index 6d6314c6cd4f..3fd4a6d1709b 100644
--- a/toolkit/components/search/SearchService.jsm
+++ b/toolkit/components/search/SearchService.jsm
@@ -694,8 +694,6 @@ SearchService.prototype = {
await this._ensureKnownRegionPromise;
}
- this._setupRemoteSettings().catch(Cu.reportError);
-
await this._loadEngines(cache);
// Make sure the current list of engines is persisted, without the need
to wait.
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
