Cast: Reshuffle files under media/cast

media/cast/sender/video_encoder_impl.cc

Index: media/cast/sender/video_encoder_impl.cc
diff --git a/media/cast/video_sender/video_encoder_impl.cc b/media/cast/sender/video_encoder_impl.cc
similarity index 90%
rename from media/cast/video_sender/video_encoder_impl.cc
rename to media/cast/sender/video_encoder_impl.cc
index 445328188c6dfc3a8af2e1598f7e86c3e94d7208..d21649784edba25098608c0470636103ee66a62d 100644
--- a/media/cast/video_sender/video_encoder_impl.cc
+++ b/media/cast/sender/video_encoder_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/cast/video_sender/video_encoder_impl.h"
+#include "media/cast/sender/video_encoder_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -11,8 +11,8 @@
 #include "base/message_loop/message_loop.h"
 #include "media/base/video_frame.h"
 #include "media/cast/cast_defines.h"
-#include "media/cast/video_sender/codecs/vp8/vp8_encoder.h"
-#include "media/cast/video_sender/fake_software_video_encoder.h"
+#include "media/cast/sender/fake_software_video_encoder.h"
+#include "media/cast/sender/vp8_encoder.h"
 
 namespace media {
 namespace cast {
@@ -43,8 +43,8 @@ void EncodeVideoFrameOnEncoderThread(
       dynamic_config.latest_frame_id_to_reference);
   encoder->UpdateRates(dynamic_config.bit_rate);
 
-  scoped_ptr<transport::EncodedFrame> encoded_frame(
-      new transport::EncodedFrame());
+  scoped_ptr<EncodedFrame> encoded_frame(
+      new EncodedFrame());
   if (!encoder->Encode(video_frame, encoded_frame.get())) {
     VLOG(1) << "Encoding failed";
     return;
@@ -53,7 +53,7 @@ void EncodeVideoFrameOnEncoderThread(
     VLOG(1) << "Encoding resulted in an empty frame";
     return;
   }
-  encoded_frame->rtp_timestamp = transport::GetVideoRtpTimestamp(capture_time);
+  encoded_frame->rtp_timestamp = GetVideoRtpTimestamp(capture_time);
   encoded_frame->reference_time = capture_time;
 
   environment->PostTask(
@@ -69,7 +69,7 @@ VideoEncoderImpl::VideoEncoderImpl(
     const VideoSenderConfig& video_config,
     int max_unacked_frames)
     : cast_environment_(cast_environment) {
-  if (video_config.codec == transport::CODEC_VIDEO_VP8) {
+  if (video_config.codec == CODEC_VIDEO_VP8) {
     encoder_.reset(new Vp8Encoder(video_config, max_unacked_frames));
     cast_environment_->PostTask(CastEnvironment::VIDEO,
                                 FROM_HERE,
@@ -77,7 +77,7 @@ VideoEncoderImpl::VideoEncoderImpl(
                                            cast_environment,
                                            encoder_.get()));
 #ifndef OFFICIAL_BUILD
-  } else if (video_config.codec == transport::CODEC_VIDEO_FAKE) {
+  } else if (video_config.codec == CODEC_VIDEO_FAKE) {
     encoder_.reset(new FakeSoftwareVideoEncoder(video_config));
 #endif
   } else {