[tor-commits] [tor-browser/tor-browser-78.1.0esr-10.0-1] Bug 31740: Remove some unnecessary RemoteSettings instances

[gk@xxxxxxxxxxxxxx]

commit 4436013e20bfe5e469b9ef94ddb48d0310028a30
Author: Alex Catarineu <acat@xxxxxxxxxxxxxx>
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 9bc7fc5d6e9a..3fb3b74a4f08 100644
--- a/netwerk/url-classifier/UrlClassifierFeatureBase.cpp
+++ b/netwerk/url-classifier/UrlClassifierFeatureBase.cpp
@@ -76,7 +76,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 7f49d94b6488..b2e667247317 100644
--- a/netwerk/url-classifier/components.conf
+++ b/netwerk/url-classifier/components.conf
@@ -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/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 608f3c475458..23cb3daa9fac 100644
--- a/toolkit/components/search/SearchService.jsm
+++ b/toolkit/components/search/SearchService.jsm
@@ -573,8 +573,6 @@ SearchService.prototype = {
         )
         .finally(() => (this._ensureKnownRegionPromise = null));
 
-      this._setupRemoteSettings().catch(Cu.reportError);
-
       await this._loadEngines(cache);
 
       // If we've got this far, but the application is now shutting down,



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits