Cast: Reshuffle files under media/cast

media/cast/sender/video_sender.h

Index: media/cast/sender/video_sender.h
diff --git a/media/cast/video_sender/video_sender.h b/media/cast/sender/video_sender.h
similarity index 93%
rename from media/cast/video_sender/video_sender.h
rename to media/cast/sender/video_sender.h
index cf8d27511c253ec39f1097f87e60e7a67c8f6602..3c82b06d7c1a63bbc12b9c682d1c025a00e0a1df 100644
--- a/media/cast/video_sender/video_sender.h
+++ b/media/cast/sender/video_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_VIDEO_SENDER_VIDEO_SENDER_H_
-#define MEDIA_CAST_VIDEO_SENDER_VIDEO_SENDER_H_
+#ifndef MEDIA_CAST_SENDER_VIDEO_SENDER_H_
+#define MEDIA_CAST_SENDER_VIDEO_SENDER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
@@ -14,10 +14,10 @@
 #include "base/time/time.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_environment.h"
-#include "media/cast/congestion_control/congestion_control.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/congestion_control.h"
+#include "media/cast/sender/rtp_timestamp_helper.h"
 
 namespace media {
 
@@ -25,13 +25,10 @@ class VideoFrame;
 
 namespace cast {
 
+class CastTransportSender;
 class LocalVideoEncoderCallback;
 class VideoEncoder;
 
-namespace transport {
-class CastTransportSender;
-}
-
 // Not thread safe. Only called from the main cast thread.
 // This class owns all objects related to sending video, objects that create RTP
 // packets, congestion control, video encoder, parsing and sending of
@@ -46,7 +43,7 @@ class VideoSender : public RtcpSenderFeedback,
               const VideoSenderConfig& video_config,
               const CreateVideoEncodeAcceleratorCallback& create_vea_cb,
               const CreateVideoEncodeMemoryCallback& create_video_encode_mem_cb,
-              transport::CastTransportSender* const transport_sender);
+              CastTransportSender* const transport_sender);
 
   virtual ~VideoSender();
 
@@ -93,7 +90,7 @@ class VideoSender : public RtcpSenderFeedback,
 
   // Called by the |video_encoder_| with the next EncodeFrame to send.
   void SendEncodedVideoFrame(int requested_bitrate_before_encode,
-                             scoped_ptr<transport::EncodedFrame> encoded_frame);
+                             scoped_ptr<EncodedFrame> encoded_frame);
 
   const scoped_refptr<CastEnvironment> cast_environment_;
 
@@ -110,7 +107,7 @@ class VideoSender : 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.
@@ -179,4 +176,4 @@ class VideoSender : public RtcpSenderFeedback,
 }  // namespace cast
 }  // namespace media
 
-#endif  // MEDIA_CAST_VIDEO_SENDER_VIDEO_SENDER_H_
+#endif  // MEDIA_CAST_SENDER_VIDEO_SENDER_H_