Issue 2738 - Fix tests to pass type bit mask to matching functions

chrome/content/tests/regexpFilters_matching.js

 (function()
 {
   module("Matching of blocking filters", {setup: prepareFilterComponents, teardown: restoreFilterComponents});
 
   function testMatch(text, location, contentType, docDomain, thirdParty, sitekey, expected)
   {
     function testMatch_internal(text, location, contentType, docDomain, thirdParty, sitekey, expected)
     {
       let filter = Filter.fromText(text);
-      let result = filter.matches(location, contentType, docDomain, thirdParty, sitekey);
+      let result = filter.matches(location, RegExpFilter.toTypeMask(contentType), docDomain, thirdParty, sitekey);
       equal(!!result, expected, '"' + text + '".matches(' + location + ", " + contentType + ", " + docDomain + ", " + (thirdParty ? "third-party" : "first-party") + ", " + (sitekey || "no-sitekey") + ")");
     }
     testMatch_internal(text, location, contentType, docDomain, thirdParty, sitekey, expected);
     if (!/^@@/.test(text))
       testMatch_internal("@@" + text, location, contentType, docDomain, thirdParty, sitekey, expected);
   }
 
   test("Basic filters", function()
   {
     testMatch("abc", "http://abc/adf", "IMAGE", null, false, null, true);
@@ skipping 280 matching lines @@
     testMatch("@@test$~image,document", "http://test/", "DOCUMENT", null, false, null, true);
     testMatch("@@test$document,~image", "http://test/", "DOCUMENT", null, false, null, true);
     testMatch("@@test$document,domain=foo.com", "http://test/", "DOCUMENT", "foo.com", false, null, true);
     testMatch("@@test$document,domain=foo.com", "http://test/", "DOCUMENT", "bar.com", false, null, false);
     testMatch("@@test$document,domain=~foo.com", "http://test/", "DOCUMENT", "foo.com", false, null, false);
     testMatch("@@test$document,domain=~foo.com", "http://test/", "DOCUMENT", "bar.com", false, null, true);
     testMatch("@@test$document,sitekey=foo-publickey", "http://test/", "DOCUMENT", "foo.com", false, "foo-publickey", true);
     testMatch("@@test$document,sitekey=foo-publickey", "http://test/", "DOCUMENT", "foo.com", false, null, false);
   });
 })();