Issue 6665 - Abstract element hiding container logic into its own module

test/filterListener.js

Index: test/filterListener.js
===================================================================
--- a/test/filterListener.js
+++ b/test/filterListener.js
@@ -25,18 +25,16 @@
 let Filter = null;
 let defaultMatcher = null;
 let SpecialSubscription = null;
 
 exports.setUp = function(callback)
 {
   sandboxedRequire = createSandbox({
     extraExports: {
-      elemHide: ["knownFilters"],
-      elemHideEmulation: ["filters"],
       elemHideExceptions: ["knownExceptions"],
       snippets: ["filters"]
     }
   });
 
   // We need to require the filterListener module so that filter changes will be
   // noticed, even though we don't directly use the module here.
   sandboxedRequire("../lib/filterListener");
@@ -76,28 +74,28 @@
         filters.push(filter.text);
       }
     }
     result[type] = filters;
   }
 
   let elemHide = sandboxedRequire("../lib/elemHide");
   result.elemhide = [];
-  for (let filter of elemHide.knownFilters)
+  for (let filter of elemHide.ElemHide._knownFilters)
     result.elemhide.push(filter.text);
 
   let elemHideExceptions = sandboxedRequire("../lib/elemHideExceptions");
   result.elemhideexception = [];
   for (let exception of elemHideExceptions.knownExceptions)
     result.elemhideexception.push(exception.text);
 
   let elemHideEmulation = sandboxedRequire("../lib/elemHideEmulation");
   result.elemhideemulation = [];
-  for (let filterText of elemHideEmulation.filters)
-    result.elemhideemulation.push(filterText);
+  for (let filter of elemHideEmulation.ElemHideEmulation._knownFilters)
+    result.elemhideemulation.push(filter.text);
 
   let snippets = sandboxedRequire("../lib/snippets");
   result.snippets = [];
   for (let filterText of snippets.filters)
     result.snippets.push(filterText);
 
   let types = ["blacklist", "whitelist", "elemhide", "elemhideexception",
                "elemhideemulation", "snippets"];