Noissue - Merge current tip to Edge bookmark

qunit/common.js

Index: qunit/common.js
===================================================================
--- a/qunit/common.js
+++ b/qunit/common.js
@@ -1,6 +1,6 @@
 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2016 Eyeo GmbH
+ * 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
@@ -17,14 +17,12 @@
 
 "use strict";
 
-importAll("filterClasses", this);
-importAll("subscriptionClasses", this);
-importAll("matcher", this);
-importAll("filterStorage", this);
-importAll("filterNotifier", this);
-importAll("elemHide", this);
-importAll("prefs", this);
-importAll("utils", this);
+const {FilterStorage} = require("filterStorage");
+const {Subscription} = require("subscriptionClasses");
+const {Filter} = require("filterClasses");
+const {defaultMatcher} = require("matcher");
+const {ElemHide} = require("elemHide");
+const {Prefs} = require("prefs");
 
 function prepareFilterComponents(keepListeners)
 {
@@ -41,23 +39,6 @@
 {
 }
 
-function preparePrefs()
-{
-  this._pbackup = Object.create(null);
-  for (let pref in Prefs)
-  {
-    let value = Prefs[pref];
-    this._pbackup[pref] = value;
-  }
-  Prefs.enabled = true;
-}
-
-function restorePrefs()
-{
-  for (let pref in this._pbackup)
-    Prefs[pref] = this._pbackup[pref];
-}
-
 function executeFirstRunActions()
 {
 }