Cast: Reshuffle files under media/cast

media/cast/sender/external_video_encoder_unittest.cc

Index: media/cast/sender/external_video_encoder_unittest.cc
diff --git a/media/cast/video_sender/external_video_encoder_unittest.cc b/media/cast/sender/external_video_encoder_unittest.cc
similarity index 95%
rename from media/cast/video_sender/external_video_encoder_unittest.cc
rename to media/cast/sender/external_video_encoder_unittest.cc
index bd0ac56d2f510c0c449b6f598fd14d85093fcf58..0b446f866e95235ba89d0ca3933d472c55c14e4c 100644
--- a/media/cast/video_sender/external_video_encoder_unittest.cc
+++ b/media/cast/sender/external_video_encoder_unittest.cc
@@ -10,10 +10,10 @@
 #include "media/base/video_frame.h"
 #include "media/cast/cast_defines.h"
 #include "media/cast/cast_environment.h"
+#include "media/cast/sender/external_video_encoder.h"
 #include "media/cast/test/fake_single_thread_task_runner.h"
 #include "media/cast/test/fake_video_encode_accelerator.h"
 #include "media/cast/test/utility/video_utility.h"
-#include "media/cast/video_sender/external_video_encoder.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace media {
@@ -54,11 +54,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);
@@ -99,7 +99,7 @@ class ExternalVideoEncoderTest : 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());