Issue 6473 - Remove WebSocket wrapper

inject.preload.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 120 matching lines @@
         configurable: true, enumerable: true, get()
         {
           let thisShadow = shadowRoot(this);
           return thisShadow == ourShadowRoot ? null : thisShadow;
         }
       });
     }
   }
 
   /*
-   * Shared request checking code, used by both the WebSocket and
-   * RTCPeerConnection wrappers.
+   * Shared request checking code, used by the RTCPeerConnection wrapper.

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

Well, it's no longer shared. We probably should just move the RTCPeerConnection
wrapper comment up here.

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

Done.

    */
   let RealCustomEvent = window.CustomEvent;
 
   // If we've been injected into a frame via contentWindow then we can simply
   // grab the copy of checkRequest left for us by the parent document. Otherwise
   // we need to set it up now, along with the event handling functions.
   if (injectedIntoContentWindow)
     checkRequest = window[eventName];
   else
   {
@@ skipping 23 matching lines @@
     {
       if (src.hasOwnProperty(name))
       {
         Object.defineProperty(dest, name,
                               Object.getOwnPropertyDescriptor(src, name));
       }
     }
   }
 
   /*
-   * WebSocket wrapper
-   *
-   * Required before Chrome 58, since the webRequest API didn't allow us to
-   * intercept WebSockets.
-   * See https://bugs.chromium.org/p/chromium/issues/detail?id=129353
-   */
-  let RealWebSocket = WebSocket;
-  let closeWebSocket = Function.prototype.call.bind(
-    RealWebSocket.prototype.close
-  );
-
-  function WrappedWebSocket(url, ...args)
-  {
-    // Throw correct exceptions if the constructor is used improperly.
-    if (!(this instanceof WrappedWebSocket)) return RealWebSocket();
-    if (arguments.length < 1) return new RealWebSocket();
-
-    let websocket = new RealWebSocket(url, ...args);
-
-    checkRequest("websocket", websocket.url, blocked =>
-    {
-      if (blocked)
-        closeWebSocket(websocket);
-    });
-
-    return websocket;
-  }
-  WrappedWebSocket.prototype = RealWebSocket.prototype;
-  window.WebSocket = WrappedWebSocket.bind();
-  copyProperties(RealWebSocket, WebSocket,
-                 ["CONNECTING", "OPEN", "CLOSING", "CLOSED", "prototype"]);
-  RealWebSocket.prototype.constructor = WebSocket;
-
-  /*
    * RTCPeerConnection wrapper
    *
    * The webRequest API in Chrome does not yet allow the blocking of
    * WebRTC connections.
    * See https://bugs.chromium.org/p/chromium/issues/detail?id=707683
    */
   let RealRTCPeerConnection = window.RTCPeerConnection ||
                                 window.webkitRTCPeerConnection;
 
   // Firefox has the option (media.peerconnection.enabled) to disable WebRTC
@@ skipping 178 matching lines @@
     // Firefox 58 only bypasses site CSPs when assigning to 'src'.
     let url = URL.createObjectURL(new Blob([
       "(" + injected + ")('" + randomEventName + "');"
     ]));
     script.src = url;
     document.documentElement.appendChild(script);
     document.documentElement.removeChild(script);
     URL.revokeObjectURL(url);
   }
 }