Cleanup in NetworkEmulationManagerImpl.
Bug: webrtc:9883
Change-Id: I845ecd66ceda9eb8c144e4c10ff374c050413a04
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/133344
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27664}diff --git a/test/scenario/network/network_emulation_manager.cc b/test/scenario/network/network_emulation_manager.cc
index b132e80..8e1dc76 100644
--- a/test/scenario/network/network_emulation_manager.cc
+++ b/test/scenario/network/network_emulation_manager.cc
@@ -75,13 +75,10 @@
auto node = absl::make_unique<EmulatedNetworkNode>(
clock_, &task_queue_, std::move(network_behavior));
EmulatedNetworkNode* out = node.get();
-
- struct Closure {
- void operator()() { manager->network_nodes_.push_back(std::move(node)); }
- NetworkEmulationManagerImpl* manager;
- std::unique_ptr<EmulatedNetworkNode> node;
- };
- task_queue_.PostTask(Closure{this, std::move(node)});
+ task_queue_.PostTask(CreateResourceOwningTask(
+ std::move(node), [this](std::unique_ptr<EmulatedNetworkNode> node) {
+ network_nodes_.push_back(std::move(node));
+ }));
return out;
}
diff --git a/test/scenario/network/network_emulation_manager.h b/test/scenario/network/network_emulation_manager.h
index 72f15fdb..cb1ace7 100644
--- a/test/scenario/network/network_emulation_manager.h
+++ b/test/scenario/network/network_emulation_manager.h
@@ -66,8 +66,6 @@
const std::vector<EmulatedEndpoint*>& endpoints) override;
private:
- FakeNetworkSocketServer* CreateSocketServer(
- const std::vector<EmulatedEndpoint*>& endpoints);
absl::optional<rtc::IPAddress> GetNextIPv4Address();
Timestamp Now() const;
