Issue 433 - Made adjustments for $sitekey-related changes to the Matcher API

webrequest.js

Index: webrequest.js
===================================================================
--- a/webrequest.js
+++ b/webrequest.js
@@ -53,11 +53,13 @@
     return true;
 
   var docDomain = extractHostFromFrame(frame);
+  var key = getKey(page, frame);
   var filter = defaultMatcher.matchesAny(
     url,
     type == "sub_frame" ? "SUBDOCUMENT" : type.toUpperCase(),
     docDomain,
-    isThirdParty(extractHostFromURL(url), docDomain)
+    isThirdParty(extractHostFromURL(url), docDomain),
+    key
   );
 
   // We can't listen to onHeadersReceived in Safari so we need to
@@ -95,7 +97,7 @@
     {
       var header = details.responseHeaders[i];
       if (header.name.toLowerCase() == "x-adblock-key" && header.value)
-        processKeyException(header.value, page, frame);
+        processKey(header.value, page, frame);
     }
 
     var notificationToShow = Notification.getNextToShow(details.url);