commit 87e9f6e666b00ecd714434643d7d7eb946d17b49
author Niels Möller <nisse@webrtc.org> Thu Jan 14 11:20:27 2021
committer Commit Bot <commit-bot@chromium.org> Fri Jan 15 10:30:50 2021
tree 1321e318f23d53e8ac4330978525ae62a14e854d
parent 3ae09f541900f18a8b680e70372f7f1d5e06bd0a

Update p2p/ to use C++ lambdas instead of rtc::Bind

Bug: webrtc:11339
Change-Id: Ie128e2ed8acb445b453682b88ceb86d968850ef1
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/201726
Reviewed-by: Jonas Oreland <jonaso@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32994}

p2p/base/fake_ice_transport.h

diff --git a/p2p/base/fake_ice_transport.h b/p2p/base/fake_ice_transport.h
index edc5730..f39da7c 100644
--- a/p2p/base/fake_ice_transport.h
+++ b/p2p/base/fake_ice_transport.h
@@ -241,7 +241,7 @@
       if (async_) {
         invoker_.AsyncInvokeDelayed<void>(
             RTC_FROM_HERE, rtc::Thread::Current(),
-            rtc::Bind(&FakeIceTransport::SendPacketInternal, this, packet),
+            [this, packet] { FakeIceTransport::SendPacketInternal(packet); },
             async_delay_ms_);
       } else {
         SendPacketInternal(packet);

p2p/base/fake_port_allocator.h

diff --git a/p2p/base/fake_port_allocator.h b/p2p/base/fake_port_allocator.h
index 266bb79..f506215 100644
--- a/p2p/base/fake_port_allocator.h
+++ b/p2p/base/fake_port_allocator.h
@@ -18,7 +18,6 @@
 #include "p2p/base/basic_packet_socket_factory.h"
 #include "p2p/base/port_allocator.h"
 #include "p2p/base/udp_port.h"
-#include "rtc_base/bind.h"
 #include "rtc_base/net_helpers.h"
 #include "rtc_base/thread.h"
 
@@ -222,9 +221,7 @@
       Initialize();
       return;
     }
-    network_thread_->Invoke<void>(RTC_FROM_HERE,
-                                  rtc::Bind(&PortAllocator::Initialize,
-                                            static_cast<PortAllocator*>(this)));
+    network_thread_->Invoke<void>(RTC_FROM_HERE, [this] { Initialize(); });
   }
 
   void SetNetworkIgnoreMask(int network_ignore_mask) override {}

p2p/base/turn_port.cc

diff --git a/p2p/base/turn_port.cc b/p2p/base/turn_port.cc
index 4d39f20..f04313f 100644
--- a/p2p/base/turn_port.cc
+++ b/p2p/base/turn_port.cc
@@ -1276,7 +1276,9 @@
   entry->set_destruction_timestamp(timestamp);
   invoker_.AsyncInvokeDelayed<void>(
       RTC_FROM_HERE, thread(),
-      rtc::Bind(&TurnPort::DestroyEntryIfNotCancelled, this, entry, timestamp),
+      [this, entry, timestamp] {
+        DestroyEntryIfNotCancelled(entry, timestamp);
+      },
       TURN_PERMISSION_TIMEOUT);
 }
 

p2p/base/turn_server.cc

diff --git a/p2p/base/turn_server.cc b/p2p/base/turn_server.cc
index 17a49e4..25985be 100644
--- a/p2p/base/turn_server.cc
+++ b/p2p/base/turn_server.cc
@@ -18,7 +18,6 @@
 #include "api/packet_socket_factory.h"
 #include "api/transport/stun.h"
 #include "p2p/base/async_stun_tcp_socket.h"
-#include "rtc_base/bind.h"
 #include "rtc_base/byte_buffer.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/helpers.h"
@@ -575,7 +574,7 @@
     sockets_to_delete_.push_back(
         std::unique_ptr<rtc::AsyncPacketSocket>(socket));
     invoker_.AsyncInvoke<void>(RTC_FROM_HERE, rtc::Thread::Current(),
-                               rtc::Bind(&TurnServer::FreeSockets, this));
+                               [this] { FreeSockets(); });
   }
 }
 

p2p/stunprober/stun_prober.cc

diff --git a/p2p/stunprober/stun_prober.cc b/p2p/stunprober/stun_prober.cc
index f37f249..3aed199 100644
--- a/p2p/stunprober/stun_prober.cc
+++ b/p2p/stunprober/stun_prober.cc
@@ -20,7 +20,6 @@
 #include "api/transport/stun.h"
 #include "rtc_base/async_packet_socket.h"
 #include "rtc_base/async_resolver_interface.h"
-#include "rtc_base/bind.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/constructor_magic.h"
 #include "rtc_base/helpers.h"
@@ -358,9 +357,8 @@
 
   // Deletion of AsyncResolverInterface can't be done in OnResolveResult which
   // handles SignalDone.
-  invoker_.AsyncInvoke<void>(
-      RTC_FROM_HERE, thread_,
-      rtc::Bind(&rtc::AsyncResolverInterface::Destroy, resolver, false));
+  invoker_.AsyncInvoke<void>(RTC_FROM_HERE, thread_,
+                             [resolver] { resolver->Destroy(false); });
   servers_.pop_back();
 
   if (servers_.size()) {
@@ -458,8 +456,8 @@
 
   if (Done()) {
     invoker_.AsyncInvokeDelayed<void>(
-        RTC_FROM_HERE, thread_,
-        rtc::Bind(&StunProber::ReportOnFinished, this, SUCCESS), timeout_ms_);
+        RTC_FROM_HERE, thread_, [this] { ReportOnFinished(SUCCESS); },
+        timeout_ms_);
     return;
   }
   if (should_send_next_request(now)) {
@@ -470,8 +468,7 @@
     next_request_time_ms_ = now + interval_ms_;
   }
   invoker_.AsyncInvokeDelayed<void>(
-      RTC_FROM_HERE, thread_,
-      rtc::Bind(&StunProber::MaybeScheduleStunRequests, this),
+      RTC_FROM_HERE, thread_, [this] { MaybeScheduleStunRequests(); },
       get_wake_up_interval_ms());
 }