Cast: Reshuffle files under media/cast

media/cast/net/rtcp/rtcp_sender.h

Index: media/cast/net/rtcp/rtcp_sender.h
diff --git a/media/cast/rtcp/rtcp_sender.h b/media/cast/net/rtcp/rtcp_sender.h
similarity index 86%
rename from media/cast/rtcp/rtcp_sender.h
rename to media/cast/net/rtcp/rtcp_sender.h
index bec05c172726fc20a3822982452778c1303d60d6..0b411f739b0f074cca578f8cfdef3dfd04cd689b 100644
--- a/media/cast/rtcp/rtcp_sender.h
+++ b/media/cast/net/rtcp/rtcp_sender.h
@@ -11,11 +11,11 @@
 
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_defines.h"
-#include "media/cast/rtcp/receiver_rtcp_event_subscriber.h"
-#include "media/cast/rtcp/rtcp.h"
-#include "media/cast/rtcp/rtcp_defines.h"
-#include "media/cast/transport/cast_transport_defines.h"
-#include "media/cast/transport/rtcp/rtcp_builder.h"
+#include "media/cast/net/cast_transport_defines.h"
+#include "media/cast/net/rtcp/receiver_rtcp_event_subscriber.h"
+#include "media/cast/net/rtcp/rtcp.h"
+#include "media/cast/net/rtcp/rtcp_builder.h"
+#include "media/cast/net/rtcp/rtcp_defines.h"
 
 namespace media {
 namespace cast {
@@ -44,7 +44,7 @@ COMPILE_ASSERT(kSecondRedundancyOffset >
 class RtcpSender {
  public:
   RtcpSender(scoped_refptr<CastEnvironment> cast_environment,
-             transport::PacedPacketSender* outgoing_transport,
+             PacedPacketSender* outgoing_transport,
              uint32 sending_ssrc,
              const std::string& c_name);
 
@@ -52,17 +52,17 @@ class RtcpSender {
 
   void SendRtcpFromRtpReceiver(
       uint32 packet_type_flags,
-      const transport::RtcpReportBlock* report_block,
+      const RtcpReportBlock* report_block,
       const RtcpReceiverReferenceTimeReport* rrtr,
       const RtcpCastMessage* cast_message,
       const ReceiverRtcpEventSubscriber::RtcpEventMultiMap* rtcp_events,
       base::TimeDelta target_delay);
 
  private:
-  void BuildRR(const transport::RtcpReportBlock* report_block,
+  void BuildRR(const RtcpReportBlock* report_block,
                Packet* packet) const;
 
-  void AddReportBlocks(const transport::RtcpReportBlock& report_block,
+  void AddReportBlocks(const RtcpReportBlock& report_block,
                        Packet* packet) const;
 
   void BuildSdec(Packet* packet) const;
@@ -114,7 +114,7 @@ class RtcpSender {
   const std::string c_name_;
 
   // Not owned by this class.
-  transport::PacedPacketSender* const transport_;
+  PacedPacketSender* const transport_;
   scoped_refptr<CastEnvironment> cast_environment_;
 
   std::deque<RtcpReceiverLogMessage> rtcp_events_history_;