Cast: Reshuffle files under media/cast

media/cast/sender/audio_sender.h

Index: media/cast/sender/audio_sender.h
diff --git a/media/cast/audio_sender/audio_sender.h b/media/cast/sender/audio_sender.h
similarity index 94%
rename from media/cast/audio_sender/audio_sender.h
rename to media/cast/sender/audio_sender.h
index 80cf8a4e9e9875117e9fd0e62f6d0091a0072d4b..4df3b143282b1a1cc5c88ef45029f44cd78f615b 100644
--- a/media/cast/audio_sender/audio_sender.h
+++ b/media/cast/sender/audio_sender.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_CAST_AUDIO_SENDER_H_
-#define MEDIA_CAST_AUDIO_SENDER_H_
+#ifndef MEDIA_CAST_SENDER_AUDIO_SENDER_H_
+#define MEDIA_CAST_SENDER_AUDIO_SENDER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
@@ -16,8 +16,8 @@
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_environment.h"
 #include "media/cast/logging/logging_defines.h"
-#include "media/cast/rtcp/rtcp.h"
-#include "media/cast/rtp_timestamp_helper.h"
+#include "media/cast/net/rtcp/rtcp.h"
+#include "media/cast/sender/rtp_timestamp_helper.h"
 
 namespace media {
 namespace cast {
@@ -36,7 +36,7 @@ class AudioSender : public RtcpSenderFeedback,
  public:
   AudioSender(scoped_refptr<CastEnvironment> cast_environment,
               const AudioSenderConfig& audio_config,
-              transport::CastTransportSender* const transport_sender);
+              CastTransportSender* const transport_sender);
 
   virtual ~AudioSender();
 
@@ -82,7 +82,7 @@ class AudioSender : public RtcpSenderFeedback,
   bool AreTooManyFramesInFlight() const;
 
   // Called by the |audio_encoder_| with the next EncodedFrame to send.
-  void SendEncodedAudioFrame(scoped_ptr<transport::EncodedFrame> audio_frame);
+  void SendEncodedAudioFrame(scoped_ptr<EncodedFrame> audio_frame);
 
   const scoped_refptr<CastEnvironment> cast_environment_;
 
@@ -99,7 +99,7 @@ class AudioSender : public RtcpSenderFeedback,
   // process to the browser process over IPC, with the browser process being
   // responsible for "packetizing" the frames and pushing packets into the
   // network layer.
-  transport::CastTransportSender* const transport_sender_;
+  CastTransportSender* const transport_sender_;
 
   // Maximum number of outstanding frames before the encoding and sending of
   // new frames shall halt.
@@ -159,4 +159,4 @@ class AudioSender : public RtcpSenderFeedback,
 }  // namespace cast
 }  // namespace media
 
-#endif  // MEDIA_CAST_AUDIO_SENDER_H_
+#endif  // MEDIA_CAST_SENDER_AUDIO_SENDER_H_