commit 05843312195912a0fab761702991f5041aba9be3
author nisse <nisse@webrtc.org> Wed Apr 19 06:38:35 2017
committer Commit bot <commit-bot@chromium.org> Wed Apr 19 06:38:35 2017
tree 26a4de5f076de858306838c05552139c39596a89
parent 69d6c00ae993d5ab395c975e925773444270752c

Delete VieRemb class, move functionality to PacketRouter.

Also rename SendFeedback --> SendTransportFeedback.

BUG=webrtc:7135

Review-Url: https://codereview.webrtc.org/2789843002
Cr-Commit-Position: refs/heads/master@{#17755}

webrtc/modules/congestion_controller/congestion_controller_unittest.cc

diff --git a/webrtc/modules/congestion_controller/congestion_controller_unittest.cc b/webrtc/modules/congestion_controller/congestion_controller_unittest.cc
index 5621936..3f14068 100644
--- a/webrtc/modules/congestion_controller/congestion_controller_unittest.cc
+++ b/webrtc/modules/congestion_controller/congestion_controller_unittest.cc
@@ -28,6 +28,8 @@
 using testing::SaveArg;
 using testing::StrictMock;
 
+namespace webrtc {
+
 namespace {
 const webrtc::PacedPacketInfo kPacingInfo0(0, 5, 2000);
 const webrtc::PacedPacketInfo kPacingInfo1(1, 8, 4000);
@@ -40,9 +42,17 @@
   return (((t << 18) + (denom >> 1)) / denom) & 0x00fffffful;
 }
 
+class MockPacketRouter : public PacketRouter {
+ public:
+  MOCK_METHOD2(OnReceiveBitrateChanged,
+               void(const std::vector<uint32_t>& ssrcs,
+                    uint32_t bitrate));
+};
+
+const uint32_t kInitialBitrateBps = 60000;
+
 }  // namespace
 
-namespace webrtc {
 namespace test {
 
 class CongestionControllerTest : public ::testing::Test {
@@ -143,7 +153,6 @@
   std::unique_ptr<RtcpBandwidthObserver> bandwidth_observer_;
   PacketRouter packet_router_;
   std::unique_ptr<CongestionController> controller_;
-  const uint32_t kInitialBitrateBps = 60000;
 
   rtc::Optional<uint32_t> target_bitrate_bps_;
 };
@@ -335,13 +344,11 @@
   controller_->Process();
 }
 
-TEST_F(CongestionControllerTest, OnReceivedPacketWithAbsSendTime) {
-  NiceMock<MockCongestionObserver> observer;
-  StrictMock<MockRemoteBitrateObserver> remote_bitrate_observer;
-  std::unique_ptr<PacedSender> pacer(new NiceMock<MockPacedSender>());
-  controller_.reset(
-      new CongestionController(&clock_, &observer, &remote_bitrate_observer,
-                               &event_log_, &packet_router_, std::move(pacer)));
+TEST(ReceiveSideCongestionControllerTest, OnReceivedPacketWithAbsSendTime) {
+  StrictMock<MockPacketRouter> packet_router;
+  SimulatedClock clock_(123456);
+
+  ReceiveSideCongestionController controller(&clock_, &packet_router);
 
   size_t payload_size = 1000;
   RTPHeader header;
@@ -349,14 +356,14 @@
   header.extension.hasAbsoluteSendTime = true;
 
   std::vector<unsigned int> ssrcs;
-  EXPECT_CALL(remote_bitrate_observer, OnReceiveBitrateChanged(_, _))
+  EXPECT_CALL(packet_router, OnReceiveBitrateChanged(_, _))
       .WillRepeatedly(SaveArg<0>(&ssrcs));
 
   for (int i = 0; i < 10; ++i) {
     clock_.AdvanceTimeMilliseconds((1000 * payload_size) / kInitialBitrateBps);
     int64_t now_ms = clock_.TimeInMilliseconds();
     header.extension.absoluteSendTime = AbsSendTime(now_ms, 1000);
-    controller_->OnReceivedPacket(now_ms, payload_size, header);
+    controller.OnReceivedPacket(now_ms, payload_size, header);
   }
 
   ASSERT_EQ(1u, ssrcs.size());