From 011d3a125e15e38111b2e21e5b089578c8514466 Mon Sep 17 00:00:00 2001
From: Sebastian Jansson <srte@webrtc.org>
Date: Wed, 17 Apr 2019 15:56:45 +0000
Subject: [PATCH] Revert "Cleanup in NetworkEmulationManagerImpl."

This reverts commit aa274d028710cb9d8f1fe3fe5ff68fe7b04e4cf2.

Reason for revert: Depends on reverted CL.

Original change's description:
> 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}

TBR=srte@webrtc.org,titovartem@webrtc.org

Change-Id: Ib62f19e382ee0a43f5892fcc694395adb410c36f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:9883
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/133484
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27673}
---
 test/scenario/network/network_emulation_manager.cc | 11 +++++++----
 test/scenario/network/network_emulation_manager.h  |  2 ++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/test/scenario/network/network_emulation_manager.cc b/test/scenario/network/network_emulation_manager.cc
index 483dba3197..ae67f6fb5e 100644
--- a/test/scenario/network/network_emulation_manager.cc
+++ b/test/scenario/network/network_emulation_manager.cc
@@ -58,10 +58,13 @@ EmulatedNetworkNode* NetworkEmulationManagerImpl::CreateEmulatedNode(
   auto node = absl::make_unique<EmulatedNetworkNode>(
       clock_, &task_queue_, std::move(network_behavior));
   EmulatedNetworkNode* out = node.get();
-  task_queue_.PostTask(CreateResourceOwningTask(
-      std::move(node), [this](std::unique_ptr<EmulatedNetworkNode> node) {
-        network_nodes_.push_back(std::move(node));
-      }));
+
+  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)});
   return out;
 }
 
diff --git a/test/scenario/network/network_emulation_manager.h b/test/scenario/network/network_emulation_manager.h
index c1645141dc..b3fd2a5c3e 100644
--- a/test/scenario/network/network_emulation_manager.h
+++ b/test/scenario/network/network_emulation_manager.h
@@ -66,6 +66,8 @@ class NetworkEmulationManagerImpl : public NetworkEmulationManager {
       const std::vector<EmulatedEndpoint*>& endpoints) override;
 
  private:
+  FakeNetworkSocketServer* CreateSocketServer(
+      const std::vector<EmulatedEndpoint*>& endpoints);
   absl::optional<rtc::IPAddress> GetNextIPv4Address();
   void ProcessNetworkPackets();
   Timestamp Now() const;