From 749f7095044c770e8d5ef901e94f51df4d81fbb1 Mon Sep 17 00:00:00 2001
From: Artem Titov <titovartem@google.com>
Date: Sat, 4 Sep 2021 00:52:08 +0200
Subject: [PATCH] [PCLF] Remove temporary AddAndReturnPeer method

Bug: b/198796179
Change-Id: I567790294044e6907eb2efb90a1babbecaae0fef
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/231184
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#34922}
---
 api/test/peerconnection_quality_test_fixture.h | 10 +---------
 test/pc/e2e/peer_connection_quality_test.cc    | 10 +---------
 test/pc/e2e/peer_connection_quality_test.h     |  4 ----
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/api/test/peerconnection_quality_test_fixture.h b/api/test/peerconnection_quality_test_fixture.h
index 94ccb04cf8..8d07ccb5ba 100644
--- a/api/test/peerconnection_quality_test_fixture.h
+++ b/api/test/peerconnection_quality_test_fixture.h
@@ -501,15 +501,7 @@ class PeerConnectionE2EQualityTestFixture {
   virtual PeerHandle* AddPeer(
       rtc::Thread* network_thread,
       rtc::NetworkManager* network_manager,
-      rtc::FunctionView<void(PeerConfigurer*)> configurer) {
-    return nullptr;
-  }
-  virtual PeerHandle* AddAndReturnPeer(
-      rtc::Thread* network_thread,
-      rtc::NetworkManager* network_manager,
-      rtc::FunctionView<void(PeerConfigurer*)> configurer) {
-    return nullptr;
-  }
+      rtc::FunctionView<void(PeerConfigurer*)> configurer) = 0;
   // Runs the media quality test, which includes setting up the call with
   // configured participants, running it according to provided `run_params` and
   // terminating it properly at the end. During call duration media quality
diff --git a/test/pc/e2e/peer_connection_quality_test.cc b/test/pc/e2e/peer_connection_quality_test.cc
index 69c5ce9678..684076cc51 100644
--- a/test/pc/e2e/peer_connection_quality_test.cc
+++ b/test/pc/e2e/peer_connection_quality_test.cc
@@ -154,8 +154,7 @@ void PeerConnectionE2EQualityTest::AddQualityMetricsReporter(
   quality_metrics_reporters_.push_back(std::move(quality_metrics_reporter));
 }
 
-PeerConnectionE2EQualityTest::PeerHandle*
-PeerConnectionE2EQualityTest::AddAndReturnPeer(
+PeerConnectionE2EQualityTest::PeerHandle* PeerConnectionE2EQualityTest::AddPeer(
     rtc::Thread* network_thread,
     rtc::NetworkManager* network_manager,
     rtc::FunctionView<void(PeerConfigurer*)> configurer) {
@@ -166,13 +165,6 @@ PeerConnectionE2EQualityTest::AddAndReturnPeer(
   return &peer_handles_.back();
 }
 
-PeerConnectionE2EQualityTest::PeerHandle* PeerConnectionE2EQualityTest::AddPeer(
-    rtc::Thread* network_thread,
-    rtc::NetworkManager* network_manager,
-    rtc::FunctionView<void(PeerConfigurer*)> configurer) {
-  return AddAndReturnPeer(network_thread, network_manager, configurer);
-}
-
 void PeerConnectionE2EQualityTest::Run(RunParams run_params) {
   SetDefaultValuesForMissingParams(&run_params, &peer_configurations_);
   ValidateParams(run_params, peer_configurations_);
diff --git a/test/pc/e2e/peer_connection_quality_test.h b/test/pc/e2e/peer_connection_quality_test.h
index 6a3b68dd3c..4426ee7553 100644
--- a/test/pc/e2e/peer_connection_quality_test.h
+++ b/test/pc/e2e/peer_connection_quality_test.h
@@ -72,10 +72,6 @@ class PeerConnectionE2EQualityTest
       rtc::Thread* network_thread,
       rtc::NetworkManager* network_manager,
       rtc::FunctionView<void(PeerConfigurer*)> configurer) override;
-  PeerHandle* AddAndReturnPeer(
-      rtc::Thread* network_thread,
-      rtc::NetworkManager* network_manager,
-      rtc::FunctionView<void(PeerConfigurer*)> configurer) override;
   void Run(RunParams run_params) override;
 
   TimeDelta GetRealTestDuration() const override {