Index: media/cast/framer/framer_unittest.cc |
diff --git a/media/cast/framer/framer_unittest.cc b/media/cast/framer/framer_unittest.cc |
index a910d4e27a913331a0214353e3f93d8265b4cb47..6640767191226c141f1e33c34f27fd6efb5d7216 100644 |
--- a/media/cast/framer/framer_unittest.cc |
+++ b/media/cast/framer/framer_unittest.cc |
@@ -27,7 +27,7 @@ |
rtp_header_.max_packet_id = 0; |
rtp_header_.is_reference = false; |
rtp_header_.reference_frame_id = 0; |
- payload_.assign(kMaxIpPacketSize, 0); |
+ payload_.assign(kIpPacketSize, 0); |
EXPECT_CALL(mock_rtp_payload_feedback_, |
CastFeedback(testing::_)).WillRepeatedly(testing::Return()); |
@@ -42,7 +42,7 @@ |
TEST_F(FramerTest, EmptyState) { |
- transport::EncodedVideoFrame frame; |
+ EncodedVideoFrame frame; |
uint32 rtp_timestamp; |
bool next_frame = false; |
EXPECT_FALSE(framer_.GetEncodedVideoFrame(&frame, &rtp_timestamp, |
@@ -50,7 +50,7 @@ |
} |
TEST_F(FramerTest, AlwaysStartWithKey) { |
- transport::EncodedVideoFrame frame; |
+ EncodedVideoFrame frame; |
uint32 rtp_timestamp; |
bool next_frame = false; |
bool complete = false; |
@@ -76,7 +76,7 @@ |
} |
TEST_F(FramerTest, CompleteFrame) { |
- transport::EncodedVideoFrame frame; |
+ EncodedVideoFrame frame; |
uint32 rtp_timestamp; |
bool next_frame = false; |
bool complete = false; |
@@ -115,7 +115,7 @@ |
} |
TEST_F(FramerTest, DuplicatePackets) { |
- transport::EncodedVideoFrame frame; |
+ EncodedVideoFrame frame; |
uint32 rtp_timestamp; |
bool next_frame = false; |
bool complete = false; |
@@ -207,7 +207,7 @@ |
} |
TEST_F(FramerTest, ContinuousSequence) { |
- transport::EncodedVideoFrame frame; |
+ EncodedVideoFrame frame; |
uint32 rtp_timestamp; |
bool next_frame = false; |
bool complete = false; |
@@ -237,7 +237,7 @@ |
TEST_F(FramerTest, Wrap) { |
// Insert key frame, frame_id = 255 (will jump to that) |
- transport::EncodedVideoFrame frame; |
+ EncodedVideoFrame frame; |
uint32 rtp_timestamp; |
bool next_frame = false; |
bool duplicate = false; |
@@ -266,7 +266,7 @@ |
} |
TEST_F(FramerTest, Reset) { |
- transport::EncodedVideoFrame frame; |
+ EncodedVideoFrame frame; |
uint32 rtp_timestamp; |
bool next_frame = false; |
bool complete = false; |
@@ -283,7 +283,7 @@ |
} |
TEST_F(FramerTest, RequireKeyAfterReset) { |
- transport::EncodedVideoFrame frame; |
+ EncodedVideoFrame frame; |
uint32 rtp_timestamp; |
bool next_frame = false; |
bool duplicate = false; |
@@ -307,7 +307,7 @@ |
} |
TEST_F(FramerTest, BasicNonLastReferenceId) { |
- transport::EncodedVideoFrame frame; |
+ EncodedVideoFrame frame; |
uint32 rtp_timestamp; |
bool next_frame = false; |
bool duplicate = false; |
@@ -335,7 +335,7 @@ |
TEST_F(FramerTest, InOrderReferenceFrameSelection) { |
// Create pattern: 0, 1, 4, 5. |
- transport::EncodedVideoFrame frame; |
+ EncodedVideoFrame frame; |
uint32 rtp_timestamp; |
bool next_frame = false; |
bool duplicate = false; |
@@ -395,7 +395,7 @@ |
TEST_F(FramerTest, AudioWrap) { |
// All audio frames are marked as key frames. |
- transport::EncodedAudioFrame frame; |
+ EncodedAudioFrame frame; |
uint32 rtp_timestamp; |
bool next_frame = false; |
bool duplicate = false; |
@@ -435,7 +435,7 @@ |
TEST_F(FramerTest, AudioWrapWithMissingFrame) { |
// All audio frames are marked as key frames. |
- transport::EncodedAudioFrame frame; |
+ EncodedAudioFrame frame; |
uint32 rtp_timestamp; |
bool next_frame = false; |
bool duplicate = false; |