Backed out changeset 9d1756abffd2 (bug 1629529) for bustages on WebrtcTCPSocket.cpp . CLOSED TREE

media/mtransport/ipc/WebrtcTCPSocket.cpp

@@ -106,16 +106,9 @@ void WebrtcTCPSocket::CloseWithReason(nsresult aReason) {
     // Let's pretend we got an open even if we didn't to prevent an Open later.
     mOpened = true;
 
-    nsresult rv = mSocketThread->Dispatch(NewRunnableMethod<nsresult>(
+    MOZ_ALWAYS_SUCCEEDS(mSocketThread->Dispatch(NewRunnableMethod<nsresult>(
         "WebrtcTCPSocket::CloseWithReason", this,
-        &WebrtcTCPSocket::CloseWithReason, aReason));
-
-    // This was MOZ_ALWAYS_SUCCEEDS, but that now uses MOZ_DIAGNOSTIC_ASSERT.
-    // In order to convert this back to MOZ_ALWAYS_SUCCEEDS we would need
-    // OnSocketThread to return true if we're shutting down and doing the
-    // "running all of STS's queued events on main" thing.
-    MOZ_ASSERT(NS_SUCCEEDED(rv));
-
+        &WebrtcTCPSocket::CloseWithReason, aReason)));
     return;
   }