Noissue - Fix a break when loading adblockpluscore into Chrome extension

lib/filterListener.js

+/* globals XPCOM, XPCOMUtils, Services */
 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
 /**
  * @fileOverview Component synchronizing filter storage with Matcher
  *               instances and ElemHide.
  */
 
-const {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
-const {XPCOMUtils} = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");

[kzar, 2017/03/30 05:30:07]

Nit: It seems you changed the order of these imports by mistake?

+Cu.import("resource://gre/modules/Services.jsm");
 
 const {FilterStorage} = require("filterStorage");
 const {FilterNotifier} = require("filterNotifier");
 const {ElemHide} = require("elemHide");
 const {ElemHideEmulation} = require("elemHideEmulation");
 const {defaultMatcher} = require("matcher");
 const {ActiveFilter, RegExpFilter,
        ElemHideBase, ElemHideEmulationFilter} = require("filterClasses");
 const {Prefs} = require("prefs");
 
@@ skipping 274 matching lines @@
   {
     if (!subscription.disabled)
       addFilters(subscription.filters);
   }
 }
 
 function onSave()
 {
   isDirty = 0;
 }