Commit ebf24a60 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.
parent 3c177460

netwerk/url-classifier/UrlClassifierFeatureBase.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

  }

netwerk/url-classifier/components.conf

+0 −6
Original line number Diff line number Diff line
@@ -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',

    },

]

toolkit/components/search/SearchService.jsm

+0 −2
Original line number Diff line number Diff line
@@ -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.