From 15157abf027fcb3f34a13ee817edb75ac000303a Mon Sep 17 00:00:00 2001
From: Artem Titov <titovartem@google.com>
Date: Fri, 3 Sep 2021 23:38:40 +0200
Subject: [PATCH] [PCLF] Make AddPeer return PeerHandle*

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

diff --git a/api/test/peerconnection_quality_test_fixture.h b/api/test/peerconnection_quality_test_fixture.h
index d9eb9d6ed4..94ccb04cf8 100644
--- a/api/test/peerconnection_quality_test_fixture.h
+++ b/api/test/peerconnection_quality_test_fixture.h
@@ -498,9 +498,12 @@ class PeerConnectionE2EQualityTestFixture {
   // `network_manager` will be used to provide network interfaces for peer's
   // peer connection.
   // `configurer` function will be used to configure peer in the call.
-  virtual void AddPeer(rtc::Thread* network_thread,
-                       rtc::NetworkManager* network_manager,
-                       rtc::FunctionView<void(PeerConfigurer*)> configurer) {}
+  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,
diff --git a/test/pc/e2e/peer_connection_quality_test.cc b/test/pc/e2e/peer_connection_quality_test.cc
index f85d08c6af..69c5ce9678 100644
--- a/test/pc/e2e/peer_connection_quality_test.cc
+++ b/test/pc/e2e/peer_connection_quality_test.cc
@@ -166,11 +166,11 @@ PeerConnectionE2EQualityTest::AddAndReturnPeer(
   return &peer_handles_.back();
 }
 
-void PeerConnectionE2EQualityTest::AddPeer(
+PeerConnectionE2EQualityTest::PeerHandle* PeerConnectionE2EQualityTest::AddPeer(
     rtc::Thread* network_thread,
     rtc::NetworkManager* network_manager,
     rtc::FunctionView<void(PeerConfigurer*)> configurer) {
-  AddAndReturnPeer(network_thread, network_manager, configurer);
+  return AddAndReturnPeer(network_thread, network_manager, configurer);
 }
 
 void PeerConnectionE2EQualityTest::Run(RunParams run_params) {
diff --git a/test/pc/e2e/peer_connection_quality_test.h b/test/pc/e2e/peer_connection_quality_test.h
index 69c92401a5..6a3b68dd3c 100644
--- a/test/pc/e2e/peer_connection_quality_test.h
+++ b/test/pc/e2e/peer_connection_quality_test.h
@@ -68,9 +68,10 @@ class PeerConnectionE2EQualityTest
   void AddQualityMetricsReporter(std::unique_ptr<QualityMetricsReporter>
                                      quality_metrics_reporter) override;
 
-  void AddPeer(rtc::Thread* network_thread,
-               rtc::NetworkManager* network_manager,
-               rtc::FunctionView<void(PeerConfigurer*)> configurer) override;
+  PeerHandle* AddPeer(
+      rtc::Thread* network_thread,
+      rtc::NetworkManager* network_manager,
+      rtc::FunctionView<void(PeerConfigurer*)> configurer) override;
   PeerHandle* AddAndReturnPeer(
       rtc::Thread* network_thread,
       rtc::NetworkManager* network_manager,