Cast: Fix two video freezing problems

media/cast/transport/rtp_sender/packet_storage/packet_storage_unittest.cc

Index: media/cast/transport/rtp_sender/packet_storage/packet_storage_unittest.cc
diff --git a/media/cast/transport/rtp_sender/packet_storage/packet_storage_unittest.cc b/media/cast/transport/rtp_sender/packet_storage/packet_storage_unittest.cc
index ae046f5f41dd8d1768f3a1a6604b0fbf8fa04675..b5cb7116faccfb0b3ef68e7cb3a46e42b8614003 100644
--- a/media/cast/transport/rtp_sender/packet_storage/packet_storage_unittest.cc
+++ b/media/cast/transport/rtp_sender/packet_storage/packet_storage_unittest.cc
@@ -24,7 +24,7 @@ static const int64 kStartMillisecond = INT64_C(12345678900000);
 
 class PacketStorageTest : public ::testing::Test {
  protected:
-  PacketStorageTest() : packet_storage_(&testing_clock_, kMaxDeltaStoredMs) {
+  PacketStorageTest() : packet_storage_(533 / 33) {
     testing_clock_.Advance(
         base::TimeDelta::FromMilliseconds(kStartMillisecond));
   }
@@ -35,63 +35,6 @@ class PacketStorageTest : public ::testing::Test {
   DISALLOW_COPY_AND_ASSIGN(PacketStorageTest);
 };
 
-TEST_F(PacketStorageTest, TimeOut) {
-  Packet test_123(100, 123);  // 100 insertions of the value 123.
-  SendPacketVector packets;
-  for (uint32 frame_id = 0; frame_id < 30; ++frame_id) {
-    base::TimeTicks frame_tick = testing_clock_.NowTicks();
-    for (uint16 packet_id = 0; packet_id < 10; ++packet_id) {
-      packet_storage_.StorePacket(frame_id,
-                                  packet_id,
-                                  PacedPacketSender::MakePacketKey(frame_tick,
-                                                                   1, // ssrc
-                                                                   packet_id),
-                                  new base::RefCountedData<Packet>(test_123));
-    }
-    testing_clock_.Advance(kDeltaBetweenFrames);
-  }
-
-  // All packets belonging to the first 14 frames is expected to be expired.
-  for (uint32 frame_id = 0; frame_id < 14; ++frame_id) {
-    for (uint16 packet_id = 0; packet_id < 10; ++packet_id) {
-      Packet packet;
-      EXPECT_FALSE(packet_storage_.GetPacket(frame_id, packet_id, &packets));
-    }
-  }
-  // All packets belonging to the next 15 frames is expected to be valid.
-  for (uint32 frame_id = 14; frame_id < 30; ++frame_id) {
-    for (uint16 packet_id = 0; packet_id < 10; ++packet_id) {
-      EXPECT_TRUE(packet_storage_.GetPacket(frame_id, packet_id, &packets));
-      EXPECT_TRUE(packets.front().second->data == test_123);
-    }
-  }
-}
-
-TEST_F(PacketStorageTest, MaxNumberOfPackets) {

[palmer, 2014/04/29 17:33:44]

Isn't some test along these lines still a good idea?

[hubbe, 2014/04/29 18:32:39]

I improved the PacketContent test to verify that older frames are no longer
stored.

-  Packet test_123(100, 123);  // 100 insertions of the value 123.
-  SendPacketVector packets;
-
-  uint32 frame_id = 0;
-  base::TimeTicks frame_tick = testing_clock_.NowTicks();
-  for (uint16 packet_id = 0; packet_id <= PacketStorage::kMaxStoredPackets;
-       ++packet_id) {
-    packet_storage_.StorePacket(frame_id,
-                                packet_id,
-                                PacedPacketSender::MakePacketKey(frame_tick,
-                                                                 1, // ssrc
-                                                                 packet_id),
-                                new base::RefCountedData<Packet>(test_123));
-  }
-  uint16 packet_id = 0;
-  EXPECT_FALSE(packet_storage_.GetPacket(frame_id, packet_id, &packets));
-
-  ++packet_id;
-  for (; packet_id <= PacketStorage::kMaxStoredPackets; ++packet_id) {
-    EXPECT_TRUE(packet_storage_.GetPacket(frame_id, packet_id, &packets));
-    EXPECT_TRUE(packets.back().second->data == test_123);
-  }
-}
-
 TEST_F(PacketStorageTest, PacketContent) {
   Packet test_123(100, 123);  // 100 insertions of the value 123.
   Packet test_234(200, 234);  // 200 insertions of the value 234.