Noissue - Use lowercase for WebRTC and WebSocket resource types

lib/requestBlocker.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * 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
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 20 matching lines @@
 
 // Chrome and Firefox (WebExtensions) can't distinguish between
 // OBJECT_SUBREQUEST and OBJECT requests.
 RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT;
 
 // Map of content types reported by the browser to the respecitve content types
 // used by Adblock Plus. Other content types are simply mapped to OTHER.
 let resourceTypes = new Map(function*()
 {
   for (let type in RegExpFilter.typeMap)
-    yield [type, type];
+    yield [type.toLowerCase(), type];
 
-  yield ["SUB_FRAME", "SUBDOCUMENT"];
+  yield ["sub_frame", "SUBDOCUMENT"];
 
   // Treat navigator.sendBeacon() the same as <a ping>, it's essentially the
   // same concept - merely generalized.
-  yield ["BEACON", "PING"];
+  yield ["beacon", "PING"];
 
   // Treat <img srcset> and <picture> the same as other images.
-  yield ["IMAGESET", "IMAGE"];
+  yield ["imageset", "IMAGE"];
 }());
 
 function onBeforeRequestAsync(page, url, type, docDomain,
                               thirdParty, sitekey,
                               specificOnly, filter)
 {
   if (filter)
     FilterNotifier.emit("filter.hitCount", filter, 0, 0, page);
 
   if (devtools)
@@ skipping 13 matching lines @@
 
   let urlString = stringifyURL(url);
   let docDomain = extractHostFromFrame(frame);
   let thirdParty = isThirdParty(url, docDomain);
   let sitekey = getKey(page, frame);
 
   let specificOnly = !!checkWhitelisted(
     page, frame, RegExpFilter.typeMap.GENERICBLOCK
   );
 
-  let mappedType = resourceTypes.get(type.toUpperCase()) || "OTHER";
+  let mappedType = resourceTypes.get(type) || "OTHER";
 
   let filter = defaultMatcher.matchesAny(
     urlString, RegExpFilter.typeMap[mappedType],
     docDomain, thirdParty, sitekey, specificOnly
   );
 
   setTimeout(onBeforeRequestAsync, 0, page, urlString,
                                       mappedType, docDomain,
                                       thirdParty, sitekey,
                                       specificOnly, filter);
@@ skipping 77 matching lines @@
 FilterNotifier.on("filter.added", onFilterChange);
 FilterNotifier.on("filter.removed", onFilterChange);
 FilterNotifier.on("filter.disabled", arg => onFilterChange(arg, true));
 FilterNotifier.on("load", onFilterChange);
 
 port.on("request.blockedByWrapper", (msg, sender) =>
 {
   // Chrome 58 onwards directly supports WebSocket blocking, so we can ignore
   // messages from the wrapper here (see https://crbug.com/129353). Hopefully
   // WebRTC will be supported soon too (see https://crbug.com/707683).
-  if (msg.requestType in chrome.webRequest.ResourceType)
+  if (msg.requestType.toUpperCase() in chrome.webRequest.ResourceType)
     return false;
 
   return ext.webRequest.onBeforeRequest._dispatch(
      new URL(msg.url),
      msg.requestType,
      sender.page,
      sender.frame
   ).includes(false);
 });