Index: media/cast/receiver/video_decoder_unittest.cc |
diff --git a/media/cast/video_receiver/video_decoder_unittest.cc b/media/cast/receiver/video_decoder_unittest.cc |
similarity index 95% |
rename from media/cast/video_receiver/video_decoder_unittest.cc |
rename to media/cast/receiver/video_decoder_unittest.cc |
index 2ca28b070ce66ede54b8c41bbd33e0b2074f21f6..913916e304ff1c56e1b0c8c57fd62b10698a18ae 100644 |
--- a/media/cast/video_receiver/video_decoder_unittest.cc |
+++ b/media/cast/receiver/video_decoder_unittest.cc |
@@ -10,10 +10,9 @@ |
#include "base/synchronization/lock.h" |
#include "base/time/time.h" |
#include "media/cast/cast_config.h" |
-#include "media/cast/test/utility/default_config.h" |
+#include "media/cast/receiver/video_decoder.h" |
#include "media/cast/test/utility/standalone_cast_environment.h" |
#include "media/cast/test/utility/video_utility.h" |
-#include "media/cast/video_receiver/video_decoder.h" |
#include "media/cast/video_sender/codecs/vp8/vp8_encoder.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -48,9 +47,7 @@ class VideoDecoderTest |
protected: |
virtual void SetUp() OVERRIDE { |
- FrameReceiverConfig decoder_config = GetDefaultVideoReceiverConfig(); |
- decoder_config.codec.video = GetParam(); |
- video_decoder_.reset(new VideoDecoder(cast_environment_, decoder_config)); |
+ video_decoder_.reset(new VideoDecoder(cast_environment_, GetParam())); |
CHECK_EQ(STATUS_VIDEO_INITIALIZED, video_decoder_->InitializationResult()); |
next_frame_timestamp_ = base::TimeDelta(); |