Cast: Reshuffle files under media/cast

media/cast/net/rtcp/rtcp.cc

Index: media/cast/net/rtcp/rtcp.cc
diff --git a/media/cast/rtcp/rtcp.cc b/media/cast/net/rtcp/rtcp.cc
similarity index 94%
rename from media/cast/rtcp/rtcp.cc
rename to media/cast/net/rtcp/rtcp.cc
index 74a4689d321dae215f1ae3dcb44ae67b4aa994f9..594bfb45819ba47468bfbac155ee5b66a53771b7 100644
--- a/media/cast/rtcp/rtcp.cc
+++ b/media/cast/net/rtcp/rtcp.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/cast/rtcp/rtcp.h"
+#include "media/cast/net/rtcp/rtcp.h"
 
 #include "base/big_endian.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_defines.h"
 #include "media/cast/cast_environment.h"
-#include "media/cast/rtcp/rtcp_defines.h"
-#include "media/cast/rtcp/rtcp_receiver.h"
-#include "media/cast/rtcp/rtcp_sender.h"
-#include "media/cast/rtcp/rtcp_utility.h"
-#include "media/cast/transport/cast_transport_defines.h"
+#include "media/cast/net/cast_transport_defines.h"
+#include "media/cast/net/rtcp/rtcp_defines.h"
+#include "media/cast/net/rtcp/rtcp_receiver.h"
+#include "media/cast/net/rtcp/rtcp_sender.h"
+#include "media/cast/net/rtcp/rtcp_utility.h"
 
 using base::TimeDelta;
 
@@ -44,7 +44,7 @@ class LocalRtcpReceiverFeedback : public RtcpReceiverFeedback {
       : rtcp_(rtcp), cast_environment_(cast_environment) {}
 
   virtual void OnReceivedSenderReport(
-      const transport::RtcpSenderInfo& remote_sender_info) OVERRIDE {
+      const RtcpSenderInfo& remote_sender_info) OVERRIDE {
     rtcp_->OnReceivedNtp(remote_sender_info.ntp_seconds,
                          remote_sender_info.ntp_fraction);
     if (remote_sender_info.send_packet_count != 0) {
@@ -76,8 +76,8 @@ class LocalRtcpReceiverFeedback : public RtcpReceiverFeedback {
 
 Rtcp::Rtcp(scoped_refptr<CastEnvironment> cast_environment,
            RtcpSenderFeedback* sender_feedback,
-           transport::CastTransportSender* const transport_sender,
-           transport::PacedPacketSender* paced_packet_sender,
+           CastTransportSender* const transport_sender,
+           PacedPacketSender* paced_packet_sender,
            RtpReceiverStatistics* rtp_receiver_statistics, RtcpMode rtcp_mode,
            const base::TimeDelta& rtcp_interval, uint32 local_ssrc,
            uint32 remote_ssrc, const std::string& c_name,
@@ -115,8 +115,8 @@ bool Rtcp::IsRtcpPacket(const uint8* packet, size_t length) {
   if (length < kMinLengthOfRtcp) return false;
 
   uint8 packet_type = packet[1];
-  if (packet_type >= transport::kPacketTypeLow &&
-      packet_type <= transport::kPacketTypeHigh) {
+  if (packet_type >= kPacketTypeLow &&
+      packet_type <= kPacketTypeHigh) {
     return true;
   }
   return false;
@@ -157,23 +157,23 @@ void Rtcp::SendRtcpFromRtpReceiver(
   uint32 packet_type_flags = 0;
 
   base::TimeTicks now = cast_environment_->Clock()->NowTicks();
-  transport::RtcpReportBlock report_block;
+  RtcpReportBlock report_block;
   RtcpReceiverReferenceTimeReport rrtr;
 
   // Attach our NTP to all RTCP packets; with this information a "smart" sender
   // can make decisions based on how old the RTCP message is.
-  packet_type_flags |= transport::kRtcpRrtr;
+  packet_type_flags |= kRtcpRrtr;
   ConvertTimeTicksToNtp(now, &rrtr.ntp_seconds, &rrtr.ntp_fraction);
   SaveLastSentNtpTime(now, rrtr.ntp_seconds, rrtr.ntp_fraction);
 
   if (cast_message) {
-    packet_type_flags |= transport::kRtcpCast;
+    packet_type_flags |= kRtcpCast;
   }
   if (rtcp_events) {
-    packet_type_flags |= transport::kRtcpReceiverLog;
+    packet_type_flags |= kRtcpReceiverLog;
   }
   if (rtcp_mode_ == kRtcpCompound || now >= next_time_to_send_rtcp_) {
-    packet_type_flags |= transport::kRtcpRr;
+    packet_type_flags |= kRtcpRr;
 
     report_block.remote_ssrc = 0;            // Not needed to set send side.
     report_block.media_ssrc = remote_ssrc_;  // SSRC of the RTP packet sender.
@@ -208,7 +208,7 @@ void Rtcp::SendRtcpFromRtpReceiver(
 void Rtcp::SendRtcpFromRtpSender(base::TimeTicks current_time,
                                  uint32 current_time_as_rtp_timestamp) {
   DCHECK(transport_sender_);
-  uint32 packet_type_flags = transport::kRtcpSr;
+  uint32 packet_type_flags = kRtcpSr;
   uint32 current_ntp_seconds = 0;
   uint32 current_ntp_fractions = 0;
   ConvertTimeTicksToNtp(current_time, &current_ntp_seconds,
@@ -216,9 +216,9 @@ void Rtcp::SendRtcpFromRtpSender(base::TimeTicks current_time,
   SaveLastSentNtpTime(current_time, current_ntp_seconds,
                       current_ntp_fractions);
 
-  transport::RtcpDlrrReportBlock dlrr;
+  RtcpDlrrReportBlock dlrr;
   if (!time_last_report_received_.is_null()) {
-    packet_type_flags |= transport::kRtcpDlrr;
+    packet_type_flags |= kRtcpDlrr;
     dlrr.last_rr = last_report_truncated_ntp_;
     uint32 delay_seconds = 0;
     uint32 delay_fraction = 0;