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

chrome/content/tests/matcher.js

Index: chrome/content/tests/matcher.js
diff --git a/chrome/content/tests/matcher.js b/chrome/content/tests/matcher.js
index 1387d888168c3ccf932877122cb0176e809ad444..bda1a8d934778663ef13ae431ed56acab5b538e9 100644
--- a/chrome/content/tests/matcher.js
+++ b/chrome/content/tests/matcher.js
@@ -30,7 +30,7 @@
     for (let filter of filters)
       matcher.add(Filter.fromText(filter));
 
-    let result = matcher.matchesAny(location, contentType, docDomain, thirdParty, sitekey);
+    let result = matcher.matchesAny(location, RegExpFilter.toTypeMask(contentType), docDomain, thirdParty, sitekey);
     if (result)
       result = result.text;
 
@@ -42,7 +42,7 @@
       for (let filter of filters)
         combinedMatcher.add(Filter.fromText(filter));
 
-      let result = combinedMatcher.matchesAny(location, contentType, docDomain, thirdParty, sitekey);
+      let result = combinedMatcher.matchesAny(location, RegExpFilter.toTypeMask(contentType), docDomain, thirdParty, sitekey);
       if (result)
         result = result.text;
 
@@ -57,7 +57,7 @@
 
   function cacheCheck(matcher, location, contentType, docDomain, thirdParty, expected)
   {
-    let result = matcher.matchesAny(location, contentType, docDomain, thirdParty);
+    let result = matcher.matchesAny(location, RegExpFilter.toTypeMask(contentType), docDomain, thirdParty);
     if (result)
       result = result.text;