Index: media/cast/sender/video_encoder_impl_unittest.cc |
diff --git a/media/cast/video_sender/video_encoder_impl_unittest.cc b/media/cast/sender/video_encoder_impl_unittest.cc |
similarity index 96% |
rename from media/cast/video_sender/video_encoder_impl_unittest.cc |
rename to media/cast/sender/video_encoder_impl_unittest.cc |
index c357d43626fc6d7cce8ca9c582cead0c01797b77..190ca2aaccb0e85e939e0487061cc3eb5bb97992 100644 |
--- a/media/cast/video_sender/video_encoder_impl_unittest.cc |
+++ b/media/cast/sender/video_encoder_impl_unittest.cc |
@@ -10,9 +10,9 @@ |
#include "media/base/video_frame.h" |
#include "media/cast/cast_defines.h" |
#include "media/cast/cast_environment.h" |
+#include "media/cast/sender/video_encoder_impl.h" |
#include "media/cast/test/fake_single_thread_task_runner.h" |
#include "media/cast/test/utility/video_utility.h" |
-#include "media/cast/video_sender/video_encoder_impl.h" |
#include "testing/gmock/include/gmock/gmock.h" |
namespace media { |
@@ -35,11 +35,11 @@ class TestVideoEncoderCallback |
} |
void DeliverEncodedVideoFrame( |
- scoped_ptr<transport::EncodedFrame> encoded_frame) { |
+ scoped_ptr<EncodedFrame> encoded_frame) { |
if (expected_frame_id_ == expected_last_referenced_frame_id_) { |
- EXPECT_EQ(transport::EncodedFrame::KEY, encoded_frame->dependency); |
+ EXPECT_EQ(EncodedFrame::KEY, encoded_frame->dependency); |
} else { |
- EXPECT_EQ(transport::EncodedFrame::DEPENDENT, |
+ EXPECT_EQ(EncodedFrame::DEPENDENT, |
encoded_frame->dependency); |
} |
EXPECT_EQ(expected_frame_id_, encoded_frame->frame_id); |
@@ -79,7 +79,7 @@ class VideoEncoderImplTest : public ::testing::Test { |
video_config_.min_qp = 0; |
video_config_.max_frame_rate = 30; |
video_config_.max_number_of_video_buffers_used = 3; |
- video_config_.codec = transport::CODEC_VIDEO_VP8; |
+ video_config_.codec = CODEC_VIDEO_VP8; |
gfx::Size size(video_config_.width, video_config_.height); |
video_frame_ = media::VideoFrame::CreateFrame( |
VideoFrame::I420, size, gfx::Rect(size), size, base::TimeDelta()); |