Delete deprecated functions in test EmulatedNetworkManagerInterface
Bug: webrtc:42232556
Change-Id: Icb054fa772b32e00011f3b22d728cef59e65a0a1
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/380744
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#44100}
diff --git a/api/test/network_emulation_manager.h b/api/test/network_emulation_manager.h
index f24f347..b2773de 100644
--- a/api/test/network_emulation_manager.h
+++ b/api/test/network_emulation_manager.h
@@ -23,7 +23,6 @@
#include "absl/strings/string_view.h"
#include "api/array_view.h"
#include "api/field_trials_view.h"
-#include "api/packet_socket_factory.h"
#include "api/test/network_emulation/cross_traffic.h"
#include "api/test/network_emulation/network_emulation_interfaces.h"
#include "api/test/simulated_network.h"
@@ -135,24 +134,6 @@
// by EmulatedNetworkManagerInterface implementation.
virtual absl::Nonnull<rtc::Thread*> network_thread() = 0;
- // Returns network manager that have to be injected into
- // WebRTC to properly setup network emulation. Returned manager is owned by
- // EmulatedNetworkManagerInterface implementation.
- // Deprecated in favor of injecting NetworkManager into PeerConnectionFactory
- // instead of creating and injecting BasicPortAllocator into PeerConnection.
- [[deprecated("bugs.webrtc.org/42232556")]] //
- virtual absl::Nonnull<rtc::NetworkManager*>
- network_manager() = 0;
-
- // Returns packet socket factory that have to be injected
- // into WebRTC to properly setup network emulation. Returned factory is owned
- // by EmulatedNetworkManagerInterface implementation.
- // Deprecated in favor of injecting SocketFactory into PeerConnectionFactory
- // instead of creating and injecting BasicPortAllocator into PeerConnection.
- [[deprecated("bugs.webrtc.org/42232556")]] //
- virtual absl::Nonnull<rtc::PacketSocketFactory*>
- packet_socket_factory() = 0;
-
// Returns objects to pass to PeerConnectionFactoryDependencies.
virtual absl::Nonnull<rtc::SocketFactory*> socket_factory() = 0;
virtual absl::Nonnull<std::unique_ptr<rtc::NetworkManager>>
diff --git a/test/network/BUILD.gn b/test/network/BUILD.gn
index 8624a3a..70e1702 100644
--- a/test/network/BUILD.gn
+++ b/test/network/BUILD.gn
@@ -58,7 +58,6 @@
"../../api/units:data_size",
"../../api/units:time_delta",
"../../api/units:timestamp",
- "../../p2p:basic_packet_socket_factory",
"../../p2p:p2p_server_utils",
"../../p2p:port_interface",
"../../rtc_base:async_packet_socket",
diff --git a/test/network/emulated_network_manager.cc b/test/network/emulated_network_manager.cc
index de58a58..b1b6867 100644
--- a/test/network/emulated_network_manager.cc
+++ b/test/network/emulated_network_manager.cc
@@ -21,7 +21,6 @@
#include "api/task_queue/task_queue_base.h"
#include "api/test/network_emulation/network_emulation_interfaces.h"
#include "api/test/time_controller.h"
-#include "p2p/base/basic_packet_socket_factory.h"
#include "rtc_base/checks.h"
#include "rtc_base/network.h"
#include "rtc_base/thread_annotations.h"
@@ -69,7 +68,6 @@
network_thread_(
time_controller->CreateThread("net_thread",
absl::WrapUnique(socket_server_))),
- packet_socket_factory_(socket_server_),
network_manager_(
std::make_unique<NetworkManagerImpl>(network_thread_.get(),
endpoints_container)),
@@ -77,12 +75,6 @@
EmulatedNetworkManager::~EmulatedNetworkManager() = default;
-rtc::NetworkManager* EmulatedNetworkManager::network_manager() {
- RTC_CHECK(network_manager_ != nullptr)
- << "network_manager() can't be used together with ReleaseNetworkManager.";
- return network_manager_.get();
-}
-
absl::Nonnull<std::unique_ptr<rtc::NetworkManager>>
EmulatedNetworkManager::ReleaseNetworkManager() {
RTC_CHECK(network_manager_ != nullptr)
diff --git a/test/network/emulated_network_manager.h b/test/network/emulated_network_manager.h
index 467b888..37ad8de 100644
--- a/test/network/emulated_network_manager.h
+++ b/test/network/emulated_network_manager.h
@@ -16,12 +16,10 @@
#include <vector>
#include "absl/base/nullability.h"
-#include "api/packet_socket_factory.h"
#include "api/task_queue/task_queue_base.h"
#include "api/test/network_emulation/network_emulation_interfaces.h"
#include "api/test/network_emulation_manager.h"
#include "api/test/time_controller.h"
-#include "p2p/base/basic_packet_socket_factory.h"
#include "rtc_base/network.h"
#include "rtc_base/socket_server.h"
#include "rtc_base/thread.h"
@@ -43,10 +41,6 @@
absl::Nonnull<rtc::Thread*> network_thread() override {
return network_thread_.get();
}
- absl::Nonnull<rtc::NetworkManager*> network_manager() override;
- absl::Nonnull<rtc::PacketSocketFactory*> packet_socket_factory() override {
- return &packet_socket_factory_;
- }
absl::Nonnull<rtc::SocketFactory*> socket_factory() override {
return socket_server_;
}
@@ -68,10 +62,7 @@
// Socket server is owned by the `network_thread_'
const absl::Nonnull<rtc::SocketServer*> socket_server_;
- // The `network_thread_` must outlive `packet_socket_factory_`, because they
- // both refer to the `socket_server_` that is owned by `network_thread_`.
const absl::Nonnull<std::unique_ptr<rtc::Thread>> network_thread_;
- rtc::BasicPacketSocketFactory packet_socket_factory_;
absl::Nullable<std::unique_ptr<NetworkManagerImpl>> network_manager_;
// Keep pointer to the network manager when it is extracted to be injected
