commit 48b1b18065c5aff930a5354f691e22df014e4be9
author Artem Titov <titovartem@webrtc.org> Fri Jul 05 11:09:48 2019
committer Commit Bot <commit-bot@chromium.org> Fri Jul 05 12:43:17 2019
tree 174a41db1865d4fcec842b382c8aa9f49a533cca
parent c8263e0638b8d613a4da069cd33fc2d19723352f

Add ability to create EmulatedNetworkNode from BuiltInNetworkBehaviorConfig

There is no public API to create NetworkBehaviorInterface from
BuiltInNetworkBehaviorConfig, so this CL will add direct method, that will
allow downstream projects to use BuiltInNetworkBehaviorConfig for network
emulation.

Bug: webrtc:10138
Change-Id: Iaec3ea17c12bd06b1c0ff3e5bc2b32cc1c4f62f8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144628
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28494}

api/test/network_emulation_manager.h

diff --git a/api/test/network_emulation_manager.h b/api/test/network_emulation_manager.h
index 404a8c0..c241cdb 100644
--- a/api/test/network_emulation_manager.h
+++ b/api/test/network_emulation_manager.h
@@ -111,6 +111,8 @@
   // Creates an emulated network node, which represents single network in
   // the emulated network layer.
   virtual EmulatedNetworkNode* CreateEmulatedNode(
+      BuiltInNetworkBehaviorConfig config) = 0;
+  virtual EmulatedNetworkNode* CreateEmulatedNode(
       std::unique_ptr<NetworkBehaviorInterface> network_behavior) = 0;
 
   // Creates an emulated endpoint, which represents single network interface on

test/network/BUILD.gn

diff --git a/test/network/BUILD.gn b/test/network/BUILD.gn
index c8f14dd..92a53c7 100644
--- a/test/network/BUILD.gn
+++ b/test/network/BUILD.gn
@@ -40,6 +40,7 @@
     "../../api/units:data_size",
     "../../api/units:time_delta",
     "../../api/units:timestamp",
+    "../../call:simulated_network",
     "../../rtc_base",
     "../../rtc_base:rtc_base_tests_utils",
     "../../rtc_base:rtc_task_queue",

test/network/network_emulation_manager.cc

diff --git a/test/network/network_emulation_manager.cc b/test/network/network_emulation_manager.cc
index 4ae7299..d2f6947 100644
--- a/test/network/network_emulation_manager.cc
+++ b/test/network/network_emulation_manager.cc
@@ -16,6 +16,7 @@
 #include "absl/memory/memory.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
+#include "call/simulated_network.h"
 #include "rtc_base/fake_network.h"
 #include "test/time_controller/real_time_controller.h"
 
@@ -70,6 +71,11 @@
 NetworkEmulationManagerImpl::~NetworkEmulationManagerImpl() = default;
 
 EmulatedNetworkNode* NetworkEmulationManagerImpl::CreateEmulatedNode(
+    BuiltInNetworkBehaviorConfig config) {
+  return CreateEmulatedNode(absl::make_unique<SimulatedNetwork>(config));
+}
+
+EmulatedNetworkNode* NetworkEmulationManagerImpl::CreateEmulatedNode(
     std::unique_ptr<NetworkBehaviorInterface> network_behavior) {
   auto node = absl::make_unique<EmulatedNetworkNode>(
       clock_, &task_queue_, std::move(network_behavior));

test/network/network_emulation_manager.h

diff --git a/test/network/network_emulation_manager.h b/test/network/network_emulation_manager.h
index c860362..118c701 100644
--- a/test/network/network_emulation_manager.h
+++ b/test/network/network_emulation_manager.h
@@ -44,6 +44,8 @@
   ~NetworkEmulationManagerImpl();
 
   EmulatedNetworkNode* CreateEmulatedNode(
+      BuiltInNetworkBehaviorConfig config) override;
+  EmulatedNetworkNode* CreateEmulatedNode(
       std::unique_ptr<NetworkBehaviorInterface> network_behavior) override;
 
   EmulatedEndpoint* CreateEndpoint(EmulatedEndpointConfig config) override;