Cast: Reshuffle files under media/cast

media/cast/sender/audio_encoder.cc

Index: media/cast/sender/audio_encoder.cc
diff --git a/media/cast/audio_sender/audio_encoder.cc b/media/cast/sender/audio_encoder.cc
similarity index 96%
rename from media/cast/audio_sender/audio_encoder.cc
rename to media/cast/sender/audio_encoder.cc
index 8f7977b6c336982cdf5a72b8cf721a25f155f517..5ad111aedbb0c3c2a710fa1550ca360ed3d18294 100644
--- a/media/cast/audio_sender/audio_encoder.cc
+++ b/media/cast/sender/audio_encoder.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/audio_sender/audio_encoder.h"
+#include "media/cast/sender/audio_encoder.h"
 
 #include <algorithm>
 
@@ -44,7 +44,7 @@ class AudioEncoder::ImplBase
     : public base::RefCountedThreadSafe<AudioEncoder::ImplBase> {
  public:
   ImplBase(const scoped_refptr<CastEnvironment>& cast_environment,
-           transport::Codec codec,
+           Codec codec,
            int num_channels,
            int sampling_rate,
            const FrameEncodedCallback& callback)
@@ -117,9 +117,9 @@ class AudioEncoder::ImplBase
       if (buffer_fill_end_ < samples_per_frame_)
         break;
 
-      scoped_ptr<transport::EncodedFrame> audio_frame(
-          new transport::EncodedFrame());
-      audio_frame->dependency = transport::EncodedFrame::KEY;
+      scoped_ptr<EncodedFrame> audio_frame(
+          new EncodedFrame());
+      audio_frame->dependency = EncodedFrame::KEY;
       audio_frame->frame_id = frame_id_;
       audio_frame->referenced_frame_id = frame_id_;
       audio_frame->rtp_timestamp = frame_rtp_timestamp_;
@@ -151,7 +151,7 @@ class AudioEncoder::ImplBase
   virtual bool EncodeFromFilledBuffer(std::string* out) = 0;
 
   const scoped_refptr<CastEnvironment> cast_environment_;
-  const transport::Codec codec_;
+  const Codec codec_;
   const int num_channels_;
   const int samples_per_frame_;
   const FrameEncodedCallback callback_;
@@ -193,7 +193,7 @@ class AudioEncoder::OpusImpl : public AudioEncoder::ImplBase {
            int bitrate,
            const FrameEncodedCallback& callback)
       : ImplBase(cast_environment,
-                 transport::CODEC_AUDIO_OPUS,
+                 CODEC_AUDIO_OPUS,
                  num_channels,
                  sampling_rate,
                  callback),
@@ -283,7 +283,7 @@ class AudioEncoder::Pcm16Impl : public AudioEncoder::ImplBase {
             int sampling_rate,
             const FrameEncodedCallback& callback)
       : ImplBase(cast_environment,
-                 transport::CODEC_AUDIO_PCM16,
+                 CODEC_AUDIO_PCM16,
                  num_channels,
                  sampling_rate,
                  callback),
@@ -329,21 +329,21 @@ AudioEncoder::AudioEncoder(
     int num_channels,
     int sampling_rate,
     int bitrate,
-    transport::Codec codec,
+    Codec codec,
     const FrameEncodedCallback& frame_encoded_callback)
     : cast_environment_(cast_environment) {
   // Note: It doesn't matter which thread constructs AudioEncoder, just so long
   // as all calls to InsertAudio() are by the same thread.
   insert_thread_checker_.DetachFromThread();
   switch (codec) {
-    case transport::CODEC_AUDIO_OPUS:
+    case CODEC_AUDIO_OPUS:
       impl_ = new OpusImpl(cast_environment,
                            num_channels,
                            sampling_rate,
                            bitrate,
                            frame_encoded_callback);
       break;
-    case transport::CODEC_AUDIO_PCM16:
+    case CODEC_AUDIO_PCM16:
       impl_ = new Pcm16Impl(cast_environment,
                             num_channels,
                             sampling_rate,