From 3a6b729a8edaabd2fe324e1f6f830869ec38d5ab Mon Sep 17 00:00:00 2001 From: Artem Titov Date: Tue, 25 Sep 2018 09:49:55 +0200 Subject: [PATCH] Cleanup: remove deprecated class shortcuts. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To be landed after 24th September. Bug: webrtc:9630 Change-Id: Ie61110357bbc6b6fc49ddf2bd5d74921e75a6e67 Reviewed-on: https://webrtc-review.googlesource.com/97041 Commit-Queue: Artem Titov Reviewed-by: Patrik Höglund Cr-Commit-Position: refs/heads/master@{#24818} --- api/test/simulated_network.h | 4 ---- call/fake_network_pipe.h | 8 -------- 2 files changed, 12 deletions(-) diff --git a/api/test/simulated_network.h b/api/test/simulated_network.h index ed5fd83c2d..3688c6ab1f 100644 --- a/api/test/simulated_network.h +++ b/api/test/simulated_network.h @@ -65,10 +65,6 @@ struct DefaultNetworkSimulationConfig { class NetworkSimulationInterface { public: - // DO NOT USE. Use DefaultNetworkSimulationConfig directly. This reference - // should be removed when all users will be switched on direct usage. - using SimulatedNetworkConfig = DefaultNetworkSimulationConfig; - virtual bool EnqueuePacket(PacketInFlightInfo packet_info) = 0; // Retrieves all packets that should be delivered by the given receive time. virtual std::vector DequeueDeliverablePackets( diff --git a/call/fake_network_pipe.h b/call/fake_network_pipe.h index 23416b623a..579e1fb18b 100644 --- a/call/fake_network_pipe.h +++ b/call/fake_network_pipe.h @@ -90,8 +90,6 @@ class NetworkPacket { class FakeNetworkPipe : public webrtc::SimulatedPacketReceiverInterface, public Transport { public: - using Config = NetworkSimulationInterface::SimulatedNetworkConfig; - // Will keep |network_simulation| alive while pipe is alive itself. // Use these constructors if you plan to insert packets using DeliverPacket(). FakeNetworkPipe( @@ -107,12 +105,6 @@ class FakeNetworkPipe : public webrtc::SimulatedPacketReceiverInterface, PacketReceiver* receiver, uint64_t seed); - // Deprecated. DO NOT USE. To be removed. Use corresponding version with - // NetworkSimulationInterface instance instead. - // Use this constructor if you plan to insert packets using SendRt[c?]p(). - FakeNetworkPipe(Clock* clock, - const FakeNetworkPipe::Config& config, - Transport* transport); // Use this constructor if you plan to insert packets using SendRt[c?]p(). FakeNetworkPipe( Clock* clock,