Cast: Deduplicate packets in paced sender and always send older packets first

media/cast/video_receiver/video_receiver_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "media/cast/cast_defines.h"
 #include "media/cast/cast_environment.h"
@@ skipping 105 matching lines @@
   // must remain alive until after its destruction.
   scoped_ptr<VideoReceiver> receiver_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoReceiverTest);
 };
 
 TEST_F(VideoReceiverTest, GetOnePacketEncodedFrame) {
   SimpleEventSubscriber event_subscriber;
   cast_environment_->Logging()->AddRawEventSubscriber(&event_subscriber);
 
-  EXPECT_CALL(mock_transport_, SendRtcpPacket(_))
+  EXPECT_CALL(mock_transport_, SendRtcpPacket(_, _))
       .WillRepeatedly(testing::Return(true));
 
   // Enqueue a request for a video frame.
   receiver_->GetEncodedVideoFrame(
       base::Bind(&FakeVideoClient::DeliverEncodedVideoFrame,
                  base::Unretained(&fake_video_client_)));
 
   // The request should not be satisfied since no packets have been received.
   task_runner_->RunTasks();
   EXPECT_EQ(0, fake_video_client_.number_times_called());
@@ skipping 11 matching lines @@
   ASSERT_TRUE(!frame_events.empty());
   EXPECT_EQ(kVideoAckSent, frame_events.begin()->type);
   EXPECT_EQ(rtp_header_.frame_id, frame_events.begin()->frame_id);
   EXPECT_EQ(rtp_header_.webrtc.header.timestamp,
             frame_events.begin()->rtp_timestamp);
 
   cast_environment_->Logging()->RemoveRawEventSubscriber(&event_subscriber);
 }
 
 TEST_F(VideoReceiverTest, MultiplePendingGetCalls) {
-  EXPECT_CALL(mock_transport_, SendRtcpPacket(_))
+  EXPECT_CALL(mock_transport_, SendRtcpPacket(_, _))
       .WillRepeatedly(testing::Return(true));
 
   // Enqueue a request for an video frame.
   const VideoFrameEncodedCallback frame_encoded_callback =
       base::Bind(&FakeVideoClient::DeliverEncodedVideoFrame,
                  base::Unretained(&fake_video_client_));
   receiver_->GetEncodedVideoFrame(frame_encoded_callback);
   task_runner_->RunTasks();
   EXPECT_EQ(0, fake_video_client_.number_times_called());
 
@@ skipping 60 matching lines @@
   // Move forward another |rtp_max_delay_ms| and run any pending tasks (there
   // should be none).  Expect no additional frames where emitted.
   testing_clock_->Advance(
       base::TimeDelta::FromMilliseconds(config_.rtp_max_delay_ms));
   task_runner_->RunTasks();
   EXPECT_EQ(3, fake_video_client_.number_times_called());
 }
 
 }  // namespace cast
 }  // namespace media