Remove deprecated AddPeer method.

Change-Id: Icd15dc4d7d79276734260fb11932d9ede8dbbf23
Bug: webrtc:14627
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/283661
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#38659}

api/test/pclf/peer_configurer.h

@@ -47,16 +47,6 @@ class PeerConfigurer {
 
   explicit PeerConfigurer(const PeerNetworkDependencies& network_dependencies);
 
-  PeerConfigurer(rtc::Thread* network_thread,
-                 rtc::NetworkManager* network_manager,
-                 rtc::PacketSocketFactory* packet_socket_factory)
-      : components_(
-            std::make_unique<InjectableComponents>(network_thread,
-                                                   network_manager,
-                                                   packet_socket_factory)),
-        params_(std::make_unique<Params>()),
-        configurable_params_(std::make_unique<ConfigurableParams>()) {}
-
   // Sets peer name that will be used to report metrics related to this peer.
   // If not set, some default name will be assigned. All names have to be
   // unique.

api/test/peerconnection_quality_test_fixture.h

@@ -65,21 +65,6 @@ namespace webrtc_pc_e2e {
 // API is in development. Can be changed/removed without notice.
 class PeerConnectionE2EQualityTestFixture {
  public:
-  using CapturingDeviceIndex = ::webrtc::webrtc_pc_e2e::CapturingDeviceIndex;
-  using ScrollingParams = ::webrtc::webrtc_pc_e2e::ScrollingParams;
-  using ScreenShareConfig = ::webrtc::webrtc_pc_e2e::ScreenShareConfig;
-  using VideoSimulcastConfig = ::webrtc::webrtc_pc_e2e::VideoSimulcastConfig;
-  using EmulatedSFUConfig = ::webrtc::webrtc_pc_e2e::EmulatedSFUConfig;
-  using VideoResolution = ::webrtc::webrtc_pc_e2e::VideoResolution;
-  using VideoDumpOptions = ::webrtc::webrtc_pc_e2e::VideoDumpOptions;
-  using VideoConfig = ::webrtc::webrtc_pc_e2e::VideoConfig;
-  using AudioConfig = ::webrtc::webrtc_pc_e2e::AudioConfig;
-  using VideoCodecConfig = ::webrtc::webrtc_pc_e2e::VideoCodecConfig;
-  using VideoSubscription = ::webrtc::webrtc_pc_e2e::VideoSubscription;
-  using EchoEmulationConfig = ::webrtc::webrtc_pc_e2e::EchoEmulationConfig;
-  using RunParams = ::webrtc::webrtc_pc_e2e::RunParams;
-  using PeerConfigurer = ::webrtc::webrtc_pc_e2e::PeerConfigurer;
-
   // Represent an entity that will report quality metrics after test.
   class QualityMetricsReporter : public StatsObserverInterface {
    public:
@@ -133,18 +118,7 @@ class PeerConnectionE2EQualityTestFixture {
   // `network_dependencies` are used to provide networking for peer's peer
   // connection. Members must be non-null.
   // `configurer` function will be used to configure peer in the call.
-  [[deprecated("bugs.webrtc.org/14627")]] virtual PeerHandle* AddPeer(
+  virtual PeerHandle* AddPeer(std::unique_ptr<PeerConfigurer> configurer) = 0;
-      const PeerNetworkDependencies& network_dependencies,
-      rtc::FunctionView<void(PeerConfigurer*)> configurer) {
-    RTC_CHECK_NOTREACHED();
-    return nullptr;
-  }
-  // TODO(bugs.webrtc.org/14627): make pure virtual once all subclasses
-  // implement it.
-  virtual PeerHandle* AddPeer(std::unique_ptr<PeerConfigurer> configurer) {
-    RTC_CHECK_NOTREACHED();
-    return nullptr;
-  }
 
   // Runs the media quality test, which includes setting up the call with
   // configured participants, running it according to provided `run_params` and

test/pc/e2e/BUILD.gn

@@ -386,15 +386,6 @@ if (!build_with_chromium) {
       absl_deps = [ "//third_party/abseil-cpp/absl/types:variant" ]
     }
 
-    rtc_library("peer_configurer") {
-      testonly = true
-      sources = [ "peer_configurer.h" ]
-      deps = [
-        ":peer_params_preprocessor",
-        "../../../api/test/pclf:peer_configurer",
-      ]
-    }
-
     rtc_library("peer_params_preprocessor") {
       visibility = [ "*" ]
       testonly = true
@@ -661,6 +652,7 @@ if (!build_with_chromium) {
         "../../../api/test/metrics:global_metrics_logger_and_exporter",
         "../../../api/test/pclf:media_configuration",
         "../../../api/test/pclf:media_quality_test_params",
+        "../../../api/test/pclf:peer_configurer",
         "../../../api/units:time_delta",
         "../../../rtc_base:timeutils",
       ]

test/pc/e2e/analyzer/video/video_quality_analyzer_injection_helper.cc

@@ -37,6 +37,7 @@ namespace webrtc {
 namespace webrtc_pc_e2e {
 namespace {
 
+using webrtc::webrtc_pc_e2e::VideoConfig;
 using EmulatedSFUConfigMap =
     ::webrtc::webrtc_pc_e2e::QualityAnalyzingVideoEncoder::EmulatedSFUConfigMap;
 

test/pc/e2e/analyzer/video/video_quality_analyzer_injection_helper.h

@@ -43,8 +43,6 @@ namespace webrtc_pc_e2e {
 // VideoQualityAnalyzerInterface into PeerConnection pipeline.
 class VideoQualityAnalyzerInjectionHelper : public StatsObserverInterface {
  public:
-  using VideoConfig = ::webrtc::webrtc_pc_e2e::VideoConfig;
-
   VideoQualityAnalyzerInjectionHelper(
       Clock* clock,
       std::unique_ptr<VideoQualityAnalyzerInterface> analyzer,
@@ -71,7 +69,7 @@ class VideoQualityAnalyzerInjectionHelper : public StatsObserverInterface {
   // `input_dump_file_name`, video will be written into that file.
   std::unique_ptr<test::TestVideoCapturer::FramePreprocessor>
   CreateFramePreprocessor(absl::string_view peer_name,
-                          const VideoConfig& config);
+                          const webrtc::webrtc_pc_e2e::VideoConfig& config);
   // Creates sink, that will allow video quality analyzer to get access to
   // the rendered frames. If corresponding video track has
   // `output_dump_file_name` in its VideoConfig, which was used for
@@ -160,7 +158,7 @@ class VideoQualityAnalyzerInjectionHelper : public StatsObserverInterface {
   Mutex mutex_;
   int peers_count_ RTC_GUARDED_BY(mutex_);
   // Map from stream label to the video config.
-  std::map<std::string, VideoConfig> known_video_configs_
+  std::map<std::string, webrtc::webrtc_pc_e2e::VideoConfig> known_video_configs_
       RTC_GUARDED_BY(mutex_);
   std::map<ReceiverStream,
            std::vector<std::unique_ptr<rtc::VideoSinkInterface<VideoFrame>>>>

test/pc/e2e/peer_configurer.h

@@ -1,24 +0,0 @@
-/*
- *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#ifndef TEST_PC_E2E_PEER_CONFIGURER_H_
-#define TEST_PC_E2E_PEER_CONFIGURER_H_
-
-#include "api/test/pclf/peer_configurer.h"
-#include "test/pc/e2e/peer_params_preprocessor.h"
-
-namespace webrtc {
-namespace webrtc_pc_e2e {
-
-using PeerConfigurerImpl = ::webrtc::webrtc_pc_e2e::PeerConfigurer;
-
-}  // namespace webrtc_pc_e2e
-}  // namespace webrtc
-
-#endif  // TEST_PC_E2E_PEER_CONFIGURER_H_

test/pc/e2e/peer_connection_quality_test.cc

@@ -195,16 +195,6 @@ void PeerConnectionE2EQualityTest::AddQualityMetricsReporter(
   quality_metrics_reporters_.push_back(std::move(quality_metrics_reporter));
 }
 
-PeerConnectionE2EQualityTest::PeerHandle* PeerConnectionE2EQualityTest::AddPeer(
-    const PeerNetworkDependencies& network_dependencies,
-    rtc::FunctionView<void(PeerConfigurer*)> configurer) {
-  peer_configurations_.push_back(
-      std::make_unique<PeerConfigurer>(network_dependencies));
-  configurer(peer_configurations_.back().get());
-  peer_handles_.push_back(PeerHandleImpl());
-  return &peer_handles_.back();
-}
-
 PeerConnectionE2EQualityTest::PeerHandle* PeerConnectionE2EQualityTest::AddPeer(
     std::unique_ptr<PeerConfigurer> configurer) {
   peer_configurations_.push_back(std::move(configurer));

test/pc/e2e/peer_connection_quality_test.h

@@ -71,9 +71,6 @@ class PeerConnectionE2EQualityTest
   void AddQualityMetricsReporter(std::unique_ptr<QualityMetricsReporter>
                                      quality_metrics_reporter) override;
 
-  PeerHandle* AddPeer(
-      const PeerNetworkDependencies& network_dependencies,
-      rtc::FunctionView<void(PeerConfigurer*)> configurer) override;
   PeerHandle* AddPeer(std::unique_ptr<PeerConfigurer> configurer) override;
   void Run(RunParams run_params) override;
 

test/pc/e2e/peer_connection_quality_test_test.cc

@@ -20,6 +20,7 @@
 #include "api/test/network_emulation_manager.h"
 #include "api/test/pclf/media_configuration.h"
 #include "api/test/pclf/media_quality_test_params.h"
+#include "api/test/pclf/peer_configurer.h"
 #include "api/test/peerconnection_quality_test_fixture.h"
 #include "api/units/time_delta.h"
 #include "rtc_base/time_utils.h"
@@ -35,8 +36,7 @@ namespace {
 using ::testing::Eq;
 using ::testing::Test;
 
-using PeerConfigurer = ::webrtc::webrtc_pc_e2e::
+using ::webrtc::webrtc_pc_e2e::PeerConfigurer;
-    PeerConnectionE2EQualityTestFixture::PeerConfigurer;
 
 // Remove files and directories in a directory non-recursively.
 void CleanDir(absl::string_view dir, size_t expected_output_files_count) {