Worker: Stop using ExecutionContextTask on WorkerLoaderProxy::postTaskToWorkerGlobalScope

third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.cpp

Index: third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.cpp
diff --git a/third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.cpp b/third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.cpp
index f7b53f92ea7d443445d23d0163200dca6c5640d5..ecddcb252995b4a3ed9841a0b04cd1506770c6dc 100644
--- a/third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.cpp
+++ b/third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.cpp
@@ -236,9 +236,7 @@ void Peer::disconnect() {
 
 static void workerGlobalScopeDidConnect(Bridge* bridge,
                                         const String& subprotocol,
-                                        const String& extensions,
-                                        ExecutionContext* context) {
-  DCHECK(context->isWorkerGlobalScope());
+                                        const String& extensions) {
   if (bridge && bridge->client())
     bridge->client()->didConnect(subprotocol, extensions);
 }
@@ -246,15 +244,12 @@ static void workerGlobalScopeDidConnect(Bridge* bridge,
 void Peer::didConnect(const String& subprotocol, const String& extensions) {
   DCHECK(isMainThread());
   m_loaderProxy->postTaskToWorkerGlobalScope(
-      BLINK_FROM_HERE,
-      createCrossThreadTask(&workerGlobalScopeDidConnect, m_bridge, subprotocol,
-                            extensions));
+      BLINK_FROM_HERE, crossThreadBind(&workerGlobalScopeDidConnect, m_bridge,
+                                       subprotocol, extensions));
 }
 
 static void workerGlobalScopeDidReceiveTextMessage(Bridge* bridge,
-                                                   const String& payload,
-                                                   ExecutionContext* context) {
-  DCHECK(context->isWorkerGlobalScope());
+                                                   const String& payload) {
   if (bridge && bridge->client())
     bridge->client()->didReceiveTextMessage(payload);
 }
@@ -262,16 +257,13 @@ static void workerGlobalScopeDidReceiveTextMessage(Bridge* bridge,
 void Peer::didReceiveTextMessage(const String& payload) {
   DCHECK(isMainThread());
   m_loaderProxy->postTaskToWorkerGlobalScope(
-      BLINK_FROM_HERE,
-      createCrossThreadTask(&workerGlobalScopeDidReceiveTextMessage, m_bridge,
-                            payload));
+      BLINK_FROM_HERE, crossThreadBind(&workerGlobalScopeDidReceiveTextMessage,
+                                       m_bridge, payload));
 }
 
 static void workerGlobalScopeDidReceiveBinaryMessage(
     Bridge* bridge,
-    std::unique_ptr<Vector<char>> payload,
-    ExecutionContext* context) {
-  DCHECK(context->isWorkerGlobalScope());
+    std::unique_ptr<Vector<char>> payload) {
   if (bridge && bridge->client())
     bridge->client()->didReceiveBinaryMessage(std::move(payload));
 }
@@ -280,15 +272,12 @@ void Peer::didReceiveBinaryMessage(std::unique_ptr<Vector<char>> payload) {
   DCHECK(isMainThread());
   m_loaderProxy->postTaskToWorkerGlobalScope(
       BLINK_FROM_HERE,
-      createCrossThreadTask(&workerGlobalScopeDidReceiveBinaryMessage, m_bridge,
-                            WTF::passed(std::move(payload))));
+      crossThreadBind(&workerGlobalScopeDidReceiveBinaryMessage, m_bridge,
+                      WTF::passed(std::move(payload))));
 }
 
-static void workerGlobalScopeDidConsumeBufferedAmount(
-    Bridge* bridge,
-    uint64_t consumed,
-    ExecutionContext* context) {
-  DCHECK(context->isWorkerGlobalScope());
+static void workerGlobalScopeDidConsumeBufferedAmount(Bridge* bridge,
+                                                      uint64_t consumed) {
   if (bridge && bridge->client())
     bridge->client()->didConsumeBufferedAmount(consumed);
 }
@@ -297,14 +286,11 @@ void Peer::didConsumeBufferedAmount(uint64_t consumed) {
   DCHECK(isMainThread());
   m_loaderProxy->postTaskToWorkerGlobalScope(
       BLINK_FROM_HERE,
-      createCrossThreadTask(&workerGlobalScopeDidConsumeBufferedAmount,
-                            m_bridge, consumed));
+      crossThreadBind(&workerGlobalScopeDidConsumeBufferedAmount, m_bridge,
+                      consumed));
 }
 
-static void workerGlobalScopeDidStartClosingHandshake(
-    Bridge* bridge,
-    ExecutionContext* context) {
-  DCHECK(context->isWorkerGlobalScope());
+static void workerGlobalScopeDidStartClosingHandshake(Bridge* bridge) {
   if (bridge && bridge->client())
     bridge->client()->didStartClosingHandshake();
 }
@@ -313,8 +299,7 @@ void Peer::didStartClosingHandshake() {
   DCHECK(isMainThread());
   m_loaderProxy->postTaskToWorkerGlobalScope(
       BLINK_FROM_HERE,
-      createCrossThreadTask(&workerGlobalScopeDidStartClosingHandshake,
-                            m_bridge));
+      crossThreadBind(&workerGlobalScopeDidStartClosingHandshake, m_bridge));
 }
 
 static void workerGlobalScopeDidClose(
@@ -322,9 +307,7 @@ static void workerGlobalScopeDidClose(
     WebSocketChannelClient::ClosingHandshakeCompletionStatus
         closingHandshakeCompletion,
     unsigned short code,
-    const String& reason,
-    ExecutionContext* context) {
-  DCHECK(context->isWorkerGlobalScope());
+    const String& reason) {
   if (bridge && bridge->client())
     bridge->client()->didClose(closingHandshakeCompletion, code, reason);
 }
@@ -339,13 +322,11 @@ void Peer::didClose(ClosingHandshakeCompletionStatus closingHandshakeCompletion,
   }
   m_loaderProxy->postTaskToWorkerGlobalScope(
       BLINK_FROM_HERE,
-      createCrossThreadTask(&workerGlobalScopeDidClose, m_bridge,
-                            closingHandshakeCompletion, code, reason));
+      crossThreadBind(&workerGlobalScopeDidClose, m_bridge,
+                      closingHandshakeCompletion, code, reason));
 }
 
-static void workerGlobalScopeDidError(Bridge* bridge,
-                                      ExecutionContext* context) {
-  DCHECK(context->isWorkerGlobalScope());
+static void workerGlobalScopeDidError(Bridge* bridge) {
   if (bridge && bridge->client())
     bridge->client()->didError();
 }
@@ -353,8 +334,7 @@ static void workerGlobalScopeDidError(Bridge* bridge,
 void Peer::didError() {
   DCHECK(isMainThread());
   m_loaderProxy->postTaskToWorkerGlobalScope(
-      BLINK_FROM_HERE,
-      createCrossThreadTask(&workerGlobalScopeDidError, m_bridge));
+      BLINK_FROM_HERE, crossThreadBind(&workerGlobalScopeDidError, m_bridge));
 }
 
 void Peer::contextDestroyed(WorkerThreadLifecycleContext*) {