diff options
| author | Niels Möller <nisse@webrtc.org> | 2021-03-19 09:45:43 +0100 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-03-19 10:05:13 +0000 |
| commit | 2b250734daaa3167526a8589bc25e2604205bc6b (patch) | |
| tree | a1d901e80c4831bd06a9ebc45c7a3667ce046d7d /p2p | |
| parent | ef7d61ed1ccab952408e33f3e64b7c52468d50fa (diff) | |
| download | webrtc-2b250734daaa3167526a8589bc25e2604205bc6b.tar.gz | |
Delete FakeIceTransport usage of AsyncInvoker
Bug: webrtc:12339
Change-Id: I1656bef5178dd150f5069d743ea7236dc0cb0300
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/212500
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Tommi <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33509}
Diffstat (limited to 'p2p')
| -rw-r--r-- | p2p/BUILD.gn | 2 | ||||
| -rw-r--r-- | p2p/base/fake_ice_transport.h | 17 |
2 files changed, 11 insertions, 8 deletions
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn index 070a30ee2c..7ccad67347 100644 --- a/p2p/BUILD.gn +++ b/p2p/BUILD.gn @@ -144,6 +144,8 @@ if (rtc_include_tests) { "../api:libjingle_peerconnection_api", "../rtc_base", "../rtc_base:rtc_base_approved", + "../rtc_base/task_utils:pending_task_safety_flag", + "../rtc_base/task_utils:to_queued_task", ] absl_deps = [ "//third_party/abseil-cpp/absl/algorithm:container", diff --git a/p2p/base/fake_ice_transport.h b/p2p/base/fake_ice_transport.h index 58d83d761c..f8be8a9835 100644 --- a/p2p/base/fake_ice_transport.h +++ b/p2p/base/fake_ice_transport.h @@ -20,8 +20,9 @@ #include "absl/types/optional.h" #include "api/ice_transport_interface.h" #include "p2p/base/ice_transport_internal.h" -#include "rtc_base/async_invoker.h" #include "rtc_base/copy_on_write_buffer.h" +#include "rtc_base/task_utils/pending_task_safety_flag.h" +#include "rtc_base/task_utils/to_queued_task.h" namespace cricket { @@ -305,12 +306,12 @@ class FakeIceTransport : public IceTransportInternal { if (!combine_outgoing_packets_ || send_packet_.size() > len) { rtc::CopyOnWriteBuffer packet(std::move(send_packet_)); if (async_) { - invoker_.AsyncInvokeDelayed<void>( - RTC_FROM_HERE, network_thread_, - [this, packet] { - RTC_DCHECK_RUN_ON(network_thread_); - FakeIceTransport::SendPacketInternal(packet); - }, + network_thread_->PostDelayedTask( + ToQueuedTask(task_safety_.flag(), + [this, packet] { + RTC_DCHECK_RUN_ON(network_thread_); + FakeIceTransport::SendPacketInternal(packet); + }), async_delay_ms_); } else { SendPacketInternal(packet); @@ -389,7 +390,6 @@ class FakeIceTransport : public IceTransportInternal { } } - rtc::AsyncInvoker invoker_; const std::string name_; const int component_; FakeIceTransport* dest_ RTC_GUARDED_BY(network_thread_) = nullptr; @@ -420,6 +420,7 @@ class FakeIceTransport : public IceTransportInternal { RTC_GUARDED_BY(network_thread_); rtc::CopyOnWriteBuffer last_sent_packet_ RTC_GUARDED_BY(network_thread_); rtc::Thread* const network_thread_; + webrtc::ScopedTaskSafetyDetached task_safety_; }; class FakeIceTransportWrapper : public webrtc::IceTransportInterface { |