Cast: Reshuffle files under media/cast

media/cast/sender/audio_sender.cc

Index: media/cast/sender/audio_sender.cc
diff --git a/media/cast/audio_sender/audio_sender.cc b/media/cast/sender/audio_sender.cc
similarity index 96%
rename from media/cast/audio_sender/audio_sender.cc
rename to media/cast/sender/audio_sender.cc
index f1e2d19fcc9edf058e51204d0cab9d97b21ff5c5..e185a2be2617da45583f07f130a232db2cb790e7 100644
--- a/media/cast/audio_sender/audio_sender.cc
+++ b/media/cast/sender/audio_sender.cc
@@ -2,15 +2,15 @@
 // 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_sender.h"
+#include "media/cast/sender/audio_sender.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
-#include "media/cast/audio_sender/audio_encoder.h"
 #include "media/cast/cast_defines.h"
-#include "media/cast/rtcp/rtcp_defines.h"
-#include "media/cast/transport/cast_transport_config.h"
+#include "media/cast/net/cast_transport_config.h"
+#include "media/cast/net/rtcp/rtcp_defines.h"
+#include "media/cast/sender/audio_encoder.h"
 
 namespace media {
 namespace cast {
@@ -38,7 +38,7 @@ int GetMaxUnackedFrames(base::TimeDelta target_delay) {
 
 AudioSender::AudioSender(scoped_refptr<CastEnvironment> cast_environment,
                          const AudioSenderConfig& audio_config,
-                         transport::CastTransportSender* const transport_sender)
+                         CastTransportSender* const transport_sender)
     : cast_environment_(cast_environment),
       target_playout_delay_(audio_config.target_playout_delay),
       transport_sender_(transport_sender),
@@ -80,7 +80,7 @@ AudioSender::AudioSender(scoped_refptr<CastEnvironment> cast_environment,
     cast_initialization_status_ = STATUS_AUDIO_UNINITIALIZED;
   }
 
-  media::cast::transport::CastTransportRtpConfig transport_config;
+  media::cast::CastTransportRtpConfig transport_config;
   transport_config.ssrc = audio_config.ssrc;
   transport_config.rtp_payload_type = audio_config.rtp_payload_type;
   // TODO(miu): AudioSender needs to be like VideoSender in providing an upper
@@ -115,7 +115,7 @@ void AudioSender::InsertAudio(scoped_ptr<AudioBus> audio_bus,
 }
 
 void AudioSender::SendEncodedAudioFrame(
-    scoped_ptr<transport::EncodedFrame> encoded_frame) {
+    scoped_ptr<EncodedFrame> encoded_frame) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
 
   const uint32 frame_id = encoded_frame->frame_id;
@@ -134,7 +134,7 @@ void AudioSender::SendEncodedAudioFrame(
   cast_environment_->Logging()->InsertEncodedFrameEvent(
       last_send_time_, FRAME_ENCODED, AUDIO_EVENT, encoded_frame->rtp_timestamp,
       frame_id, static_cast<int>(encoded_frame->data.size()),
-      encoded_frame->dependency == transport::EncodedFrame::KEY,
+      encoded_frame->dependency == EncodedFrame::KEY,
       configured_encoder_bitrate_);
   // Only use lowest 8 bits as key.
   frame_id_to_rtp_timestamp_[frame_id & 0xff] = encoded_frame->rtp_timestamp;