Issue 6473 - Remove WebSocket wrapper

lib/requestBlocker.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 187 matching lines @@
 
 FilterNotifier.on("subscription.added", onFilterChange);
 FilterNotifier.on("subscription.removed", onFilterChange);
 FilterNotifier.on("subscription.updated", onFilterChange);
 FilterNotifier.on("subscription.disabled", arg => onFilterChange(arg, true));
 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) =>

[Sebastian Noack, 2018/03/13 17:43:01]

You might want to rename this message to "request.blockedByRTCWrapper".

[Manish Jethani, 2018/03/13 18:05:11]

Done.

 {
-  // 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).
-  // Edge supports neither webRequest.ResourceType nor WebSocket blocking yet:
-  // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/10297376/
-  if (browser.webRequest.ResourceType &&
-      (msg.requestType.toUpperCase() in browser.webRequest.ResourceType))
-  {
-    return false;
-  }
-
   return ext.webRequest.onBeforeRequest._dispatch(
      new URL(msg.url),
      msg.requestType,

[Sebastian Noack, 2018/03/13 17:43:01]

This can be hard-coded to "webrtc" now.

[Manish Jethani, 2018/03/13 18:05:11]

Done.

      sender.page,
      sender.frame
   ).includes(false);
 });

[Sebastian Noack, 2018/03/13 17:43:01]

Please also remove the hard-coded "WEBSOCKET" value from filterTypes.

[Manish Jethani, 2018/03/13 18:05:11]

Done.