Issue 5027 - Use updated webRequest API for WebSocket blocking

lib/requestBlocker.js

Index: lib/requestBlocker.js
===================================================================
--- a/lib/requestBlocker.js
+++ b/lib/requestBlocker.js
@@ -147,17 +147,20 @@
 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.websocket", (msg, sender) =>
+if (!("WEBSOCKET" in chrome.webRequest.ResourceType))

[kzar, 2017/03/28 05:38:13]

Again please leave a comment here explaining that why this code is necessary for
versions of Chrome before 58. Ideally link the Chromium issue too.

That way when we increase the minimum Chrome version in the future it will be
obvious that we can remove this code.

[Jon Sonesen, 2017/03/28 13:03:14]

No problem

 {
-  return ext.webRequest.onBeforeRequest._dispatch(
-    new URL(msg.url),
-    "WEBSOCKET",
-    sender.page,
-    sender.frame
-  ).indexOf(false) != -1;
-});
+  port.on("request.websocket", (msg, sender) =>
+  {
+    return ext.webRequest.onBeforeRequest._dispatch(
+      new URL(msg.url),
+      "WEBSOCKET",
+      sender.page,
+      sender.frame
+    ).indexOf(false) != -1;
+  });
+}