[Cast] EncodedAudioFrame+EncodedVideoFrame+reference_time --> EncodedFrame

media/cast/framer/frame_buffer_unittest.cc

Index: media/cast/framer/frame_buffer_unittest.cc
diff --git a/media/cast/framer/frame_buffer_unittest.cc b/media/cast/framer/frame_buffer_unittest.cc
index c00aa2b77bb9b25f9c71fa67ba6f43a3a4d5ee91..7193d2bd8aa132192337465a0d8a762f6de791aa 100644
--- a/media/cast/framer/frame_buffer_unittest.cc
+++ b/media/cast/framer/frame_buffer_unittest.cc
@@ -29,26 +29,25 @@ TEST_F(FrameBufferTest, OnePacketInsertSanity) {
   rtp_header_.frame_id = 5;
   rtp_header_.reference_frame_id = 5;
   buffer_.InsertPacket(payload_.data(), payload_.size(), rtp_header_);
-  transport::EncodedVideoFrame frame;
-  EXPECT_TRUE(buffer_.GetEncodedVideoFrame(&frame));
+  transport::EncodedFrame frame;
+  EXPECT_TRUE(buffer_.AssembleEncodedFrame(&frame));
   EXPECT_EQ(5u, frame.frame_id);
-  EXPECT_TRUE(frame.key_frame);
+  EXPECT_EQ(5u, frame.base_frame_id);
   EXPECT_EQ(3000u, frame.rtp_timestamp);
 }
 
 TEST_F(FrameBufferTest, EmptyBuffer) {
   EXPECT_FALSE(buffer_.Complete());
-  EXPECT_FALSE(buffer_.is_key_frame());
-  transport::EncodedVideoFrame frame;
-  EXPECT_FALSE(buffer_.GetEncodedVideoFrame(&frame));
+  transport::EncodedFrame frame;
+  EXPECT_FALSE(buffer_.AssembleEncodedFrame(&frame));
 }
 
 TEST_F(FrameBufferTest, DefaultOnePacketFrame) {
   buffer_.InsertPacket(payload_.data(), payload_.size(), rtp_header_);
   EXPECT_TRUE(buffer_.Complete());
-  EXPECT_FALSE(buffer_.is_key_frame());
-  transport::EncodedVideoFrame frame;
-  EXPECT_TRUE(buffer_.GetEncodedVideoFrame(&frame));
+  EXPECT_TRUE(buffer_.is_key_frame());
+  transport::EncodedFrame frame;
+  EXPECT_TRUE(buffer_.AssembleEncodedFrame(&frame));
   EXPECT_EQ(payload_.size(), frame.data.size());
 }
 
@@ -63,8 +62,8 @@ TEST_F(FrameBufferTest, MultiplePacketFrame) {
   ++rtp_header_.packet_id;
   EXPECT_TRUE(buffer_.Complete());
   EXPECT_TRUE(buffer_.is_key_frame());
-  transport::EncodedVideoFrame frame;
-  EXPECT_TRUE(buffer_.GetEncodedVideoFrame(&frame));
+  transport::EncodedFrame frame;
+  EXPECT_TRUE(buffer_.AssembleEncodedFrame(&frame));
   EXPECT_EQ(3 * payload_.size(), frame.data.size());
 }