Cast: Reshuffle files under media/cast

media/cast/receiver/video_decoder.cc

Index: media/cast/receiver/video_decoder.cc
diff --git a/media/cast/receiver/video_decoder.cc b/media/cast/receiver/video_decoder.cc
index 896cb0a904ca509bf21adf383d829617124c0a8c..f4de9c3b31869c040a56e6a072816752dc1bbd2e 100644
--- a/media/cast/receiver/video_decoder.cc
+++ b/media/cast/receiver/video_decoder.cc
@@ -30,7 +30,7 @@ class VideoDecoder::ImplBase
     : public base::RefCountedThreadSafe<VideoDecoder::ImplBase> {
  public:
   ImplBase(const scoped_refptr<CastEnvironment>& cast_environment,
-           transport::Codec codec)
+           Codec codec)
       : cast_environment_(cast_environment),
         codec_(codec),
         cast_initialization_status_(STATUS_VIDEO_UNINITIALIZED),
@@ -40,7 +40,7 @@ class VideoDecoder::ImplBase
     return cast_initialization_status_;
   }
 
-  void DecodeFrame(scoped_ptr<transport::EncodedFrame> encoded_frame,
+  void DecodeFrame(scoped_ptr<EncodedFrame> encoded_frame,
                    const DecodeFrameCallback& callback) {
     DCHECK_EQ(cast_initialization_status_, STATUS_VIDEO_INITIALIZED);
 
@@ -77,7 +77,7 @@ class VideoDecoder::ImplBase
   virtual scoped_refptr<VideoFrame> Decode(uint8* data, int len) = 0;
 
   const scoped_refptr<CastEnvironment> cast_environment_;
-  const transport::Codec codec_;
+  const Codec codec_;
 
   // Subclass' ctor is expected to set this to STATUS_VIDEO_INITIALIZED.
   CastInitializationStatus cast_initialization_status_;
@@ -92,7 +92,7 @@ class VideoDecoder::ImplBase
 class VideoDecoder::Vp8Impl : public VideoDecoder::ImplBase {
  public:
   explicit Vp8Impl(const scoped_refptr<CastEnvironment>& cast_environment)
-      : ImplBase(cast_environment, transport::CODEC_VIDEO_VP8) {
+      : ImplBase(cast_environment, CODEC_VIDEO_VP8) {
     if (ImplBase::cast_initialization_status_ != STATUS_VIDEO_UNINITIALIZED)
       return;
 
@@ -173,7 +173,7 @@ class VideoDecoder::Vp8Impl : public VideoDecoder::ImplBase {
 class VideoDecoder::FakeImpl : public VideoDecoder::ImplBase {
  public:
   explicit FakeImpl(const scoped_refptr<CastEnvironment>& cast_environment)
-      : ImplBase(cast_environment, transport::CODEC_VIDEO_FAKE),
+      : ImplBase(cast_environment, CODEC_VIDEO_FAKE),
         last_decoded_id_(-1) {
     if (ImplBase::cast_initialization_status_ != STATUS_VIDEO_UNINITIALIZED)
       return;
@@ -214,18 +214,18 @@ class VideoDecoder::FakeImpl : public VideoDecoder::ImplBase {
 
 VideoDecoder::VideoDecoder(
     const scoped_refptr<CastEnvironment>& cast_environment,
-    transport::Codec codec)
+    Codec codec)
     : cast_environment_(cast_environment) {
   switch (codec) {
 #ifndef OFFICIAL_BUILD
-    case transport::CODEC_VIDEO_FAKE:
+    case CODEC_VIDEO_FAKE:
       impl_ = new FakeImpl(cast_environment);
       break;
 #endif
-    case transport::CODEC_VIDEO_VP8:
+    case CODEC_VIDEO_VP8:
       impl_ = new Vp8Impl(cast_environment);
       break;
-    case transport::CODEC_VIDEO_H264:
+    case CODEC_VIDEO_H264:
       // TODO(miu): Need implementation.
       NOTIMPLEMENTED();
       break;
@@ -244,7 +244,7 @@ CastInitializationStatus VideoDecoder::InitializationResult() const {
 }
 
 void VideoDecoder::DecodeFrame(
-    scoped_ptr<transport::EncodedFrame> encoded_frame,
+    scoped_ptr<EncodedFrame> encoded_frame,
     const DecodeFrameCallback& callback) {
   DCHECK(encoded_frame.get());
   DCHECK(!callback.is_null());