Cast: Reshuffle files under media/cast

media/cast/net/rtcp/rtcp.h

Index: media/cast/net/rtcp/rtcp.h
diff --git a/media/cast/rtcp/rtcp.h b/media/cast/net/rtcp/rtcp.h
similarity index 93%
rename from media/cast/rtcp/rtcp.h
rename to media/cast/net/rtcp/rtcp.h
index e7cdb6c22326502a1a31fbddebb970321d643000..813518ecb617e9e012ce21f26d3efba8445239ec 100644
--- a/media/cast/rtcp/rtcp.h
+++ b/media/cast/net/rtcp/rtcp.h
@@ -13,15 +13,15 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/time/tick_clock.h"
 #include "base/time/time.h"
-#include "media/cast/base/clock_drift_smoother.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_defines.h"
 #include "media/cast/cast_environment.h"
-#include "media/cast/rtcp/receiver_rtcp_event_subscriber.h"
-#include "media/cast/rtcp/rtcp_defines.h"
-#include "media/cast/transport/cast_transport_defines.h"
-#include "media/cast/transport/cast_transport_sender.h"
-#include "media/cast/transport/pacing/paced_sender.h"
+#include "media/cast/common/clock_drift_smoother.h"
+#include "media/cast/net/cast_transport_defines.h"
+#include "media/cast/net/cast_transport_sender.h"
+#include "media/cast/net/pacing/paced_sender.h"
+#include "media/cast/net/rtcp/receiver_rtcp_event_subscriber.h"
+#include "media/cast/net/rtcp/rtcp_defines.h"
 
 namespace media {
 namespace cast {
@@ -60,8 +60,8 @@ class Rtcp {
   // be used by the Cast receivers and test applications.
   Rtcp(scoped_refptr<CastEnvironment> cast_environment,
        RtcpSenderFeedback* sender_feedback,
-       transport::CastTransportSender* const transport_sender,  // Send-side.
-       transport::PacedPacketSender* paced_packet_sender,       // Receive side.
+       CastTransportSender* const transport_sender,  // Send-side.
+       PacedPacketSender* paced_packet_sender,       // Receive side.
        RtpReceiverStatistics* rtp_receiver_statistics,
        RtcpMode rtcp_mode,
        const base::TimeDelta& rtcp_interval,
@@ -150,7 +150,7 @@ class Rtcp {
                            uint32 last_ntp_fraction);
 
   scoped_refptr<CastEnvironment> cast_environment_;
-  transport::CastTransportSender* const transport_sender_;
+  CastTransportSender* const transport_sender_;
   const base::TimeDelta rtcp_interval_;
   const RtcpMode rtcp_mode_;
   const uint32 local_ssrc_;