From db7920424c1e18eecac229947472b3f391f98e42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@webrtc.org>
Date: Mon, 11 Jan 2021 15:18:44 +0100
Subject: [PATCH] Change PeerConnectionE2EQualityTest to use lambdas instead of
 rtc::Bind

Bug: webrtc:11339
Change-Id: I17ff9f01ca4039165227ad5c98195baa81a14d79
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/201206
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32969}
---
 test/pc/e2e/peer_connection_quality_test.cc | 29 +++++++++------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/test/pc/e2e/peer_connection_quality_test.cc b/test/pc/e2e/peer_connection_quality_test.cc
index 26039f8b5e..a234d2b705 100644
--- a/test/pc/e2e/peer_connection_quality_test.cc
+++ b/test/pc/e2e/peer_connection_quality_test.cc
@@ -25,7 +25,6 @@
 #include "api/test/video_quality_analyzer_interface.h"
 #include "pc/sdp_utils.h"
 #include "pc/test/mock_peer_connection_observers.h"
-#include "rtc_base/bind.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "system_wrappers/include/cpu_info.h"
@@ -311,23 +310,20 @@ void PeerConnectionE2EQualityTest::Run(RunParams run_params) {
                               });
 
   // Setup call.
-  signaling_thread->Invoke<void>(
-      RTC_FROM_HERE,
-      rtc::Bind(&PeerConnectionE2EQualityTest::SetupCallOnSignalingThread, this,
-                run_params));
+  signaling_thread->Invoke<void>(RTC_FROM_HERE, [this, &run_params] {
+    SetupCallOnSignalingThread(run_params);
+  });
   std::unique_ptr<SignalingInterceptor> signaling_interceptor =
       CreateSignalingInterceptor(run_params);
   // Connect peers.
-  signaling_thread->Invoke<void>(
-      RTC_FROM_HERE,
-      rtc::Bind(&PeerConnectionE2EQualityTest::ExchangeOfferAnswer, this,
-                signaling_interceptor.get()));
+  signaling_thread->Invoke<void>(RTC_FROM_HERE, [this, &signaling_interceptor] {
+    ExchangeOfferAnswer(signaling_interceptor.get());
+  });
   WaitUntilIceCandidatesGathered(signaling_thread.get());
 
-  signaling_thread->Invoke<void>(
-      RTC_FROM_HERE,
-      rtc::Bind(&PeerConnectionE2EQualityTest::ExchangeIceCandidates, this,
-                signaling_interceptor.get()));
+  signaling_thread->Invoke<void>(RTC_FROM_HERE, [this, &signaling_interceptor] {
+    ExchangeIceCandidates(signaling_interceptor.get());
+  });
   WaitUntilPeersAreConnected(signaling_thread.get());
 
   executor_->Start(task_queue_.get());
@@ -359,10 +355,9 @@ void PeerConnectionE2EQualityTest::Run(RunParams run_params) {
   alice_->DetachAecDump();
   bob_->DetachAecDump();
   // Tear down the call.
-  signaling_thread->Invoke<void>(
-      RTC_FROM_HERE,
-      rtc::Bind(&PeerConnectionE2EQualityTest::TearDownCallOnSignalingThread,
-                this));
+  signaling_thread->Invoke<void>(RTC_FROM_HERE,
+                                 [this] { TearDownCallOnSignalingThread(); });
+
   Timestamp end_time = Now();
   RTC_LOG(INFO) << "All peers are disconnected.";
   {