commit 9e09a1f327018143723c330069b51b16613a6f11
author Danil Chapovalov <danilchap@webrtc.org> Thu Sep 08 18:38:10 2022 +0200
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Sep 09 10:44:17 2022 +0000
tree 215ae9689fe99ccaecc5a29eef570a6fd0c52165
parent b190ca9e70ca448e36ec9951c46faedd5cd1dbb9

Replace Thread::Invoke with Thread::BlockingCall

BlockingCall doesn't take rtc::Location parameter and thus most of the dependencies on location can be removed

Bug: webrtc:11318
Change-Id: I91a17e342dd9a9e3e2c8f7fbe267474c98a8d0e5
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/274620
Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38045}

pc/data_channel_controller.cc

diff --git a/pc/data_channel_controller.cc b/pc/data_channel_controller.cc
index b655b53..36f11fe 100644
--- a/pc/data_channel_controller.cc
+++ b/pc/data_channel_controller.cc
@@ -16,7 +16,6 @@
 #include "api/rtc_error.h"
 #include "pc/peer_connection_internal.h"
 #include "pc/sctp_utils.h"
-#include "rtc_base/location.h"
 #include "rtc_base/logging.h"
 
 namespace webrtc {
@@ -81,7 +80,7 @@
 
 void DataChannelController::AddSctpDataStream(int sid) {
   if (data_channel_transport()) {
-    network_thread()->Invoke<void>(RTC_FROM_HERE, [this, sid] {
+    network_thread()->BlockingCall([this, sid] {
       if (data_channel_transport()) {
         data_channel_transport()->OpenChannel(sid);
       }
@@ -91,7 +90,7 @@
 
 void DataChannelController::RemoveSctpDataStream(int sid) {
   if (data_channel_transport()) {
-    network_thread()->Invoke<void>(RTC_FROM_HERE, [this, sid] {
+    network_thread()->BlockingCall([this, sid] {
       if (data_channel_transport()) {
         data_channel_transport()->CloseChannel(sid);
       }
@@ -382,15 +381,14 @@
     const rtc::CopyOnWriteBuffer& payload,
     cricket::SendDataResult* result) {
   // TODO(bugs.webrtc.org/11547): Expect method to be called on the network
-  // thread instead. Remove the Invoke() below and move assocated state to
+  // thread instead. Remove the BlockingCall() below and move assocated state to
   // the network thread.
   RTC_DCHECK_RUN_ON(signaling_thread());
   RTC_DCHECK(data_channel_transport());
 
-  RTCError error = network_thread()->Invoke<RTCError>(
-      RTC_FROM_HERE, [this, sid, params, payload] {
-        return data_channel_transport()->SendData(sid, params, payload);
-      });
+  RTCError error = network_thread()->BlockingCall([this, sid, params, payload] {
+    return data_channel_transport()->SendData(sid, params, payload);
+  });
 
   if (error.ok()) {
     *result = cricket::SendDataResult::SDR_SUCCESS;