Cast: Reshuffle files under media/cast

media/cast/net/rtcp/rtcp_sender_unittest.cc

Index: media/cast/net/rtcp/rtcp_sender_unittest.cc
diff --git a/media/cast/rtcp/rtcp_sender_unittest.cc b/media/cast/net/rtcp/rtcp_sender_unittest.cc
similarity index 89%
rename from media/cast/rtcp/rtcp_sender_unittest.cc
rename to media/cast/net/rtcp/rtcp_sender_unittest.cc
index 49534f652a3f456fafc7203aee985b33d8305809..be5631a0ab1780dab38033ff69630f308ae9980b 100644
--- a/media/cast/rtcp/rtcp_sender_unittest.cc
+++ b/media/cast/net/rtcp/rtcp_sender_unittest.cc
@@ -6,13 +6,13 @@
 #include "base/test/simple_test_tick_clock.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_sender.h"
-#include "media/cast/rtcp/rtcp_utility.h"
-#include "media/cast/rtcp/test_rtcp_packet_builder.h"
+#include "media/cast/net/cast_transport_defines.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_sender.h"
+#include "media/cast/net/rtcp/rtcp_utility.h"
+#include "media/cast/net/rtcp/test_rtcp_packet_builder.h"
 #include "media/cast/test/fake_single_thread_task_runner.h"
-#include "media/cast/transport/cast_transport_defines.h"
-#include "media/cast/transport/pacing/paced_sender.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace media {
@@ -25,8 +25,8 @@ static const base::TimeDelta kDefaultDelay =
     base::TimeDelta::FromMilliseconds(100);
 static const std::string kCName("test@10.1.1.1");
 
-transport::RtcpReportBlock GetReportBlock() {
-  transport::RtcpReportBlock report_block;
+RtcpReportBlock GetReportBlock() {
+  RtcpReportBlock report_block;
   // Initialize remote_ssrc to a "clearly illegal" value.
   report_block.remote_ssrc = 0xDEAD;
   report_block.media_ssrc = kMediaSsrc;  // SSRC of the RTP packet sender.
@@ -41,12 +41,12 @@ transport::RtcpReportBlock GetReportBlock() {
 
 }  // namespace
 
-class TestRtcpTransport : public transport::PacedPacketSender {
+class TestRtcpTransport : public PacedPacketSender {
  public:
   TestRtcpTransport() : packet_count_(0) {}
 
   virtual bool SendRtcpPacket(uint32 ssrc,
-                              transport::PacketRef packet) OVERRIDE {
+                              PacketRef packet) OVERRIDE {
     EXPECT_EQ(expected_packet_.size(), packet->data.size());
     EXPECT_EQ(0, memcmp(expected_packet_.data(),
                         packet->data.data(),
@@ -56,17 +56,17 @@ class TestRtcpTransport : public transport::PacedPacketSender {
   }
 
   virtual bool SendPackets(
-      const transport::SendPacketVector& packets) OVERRIDE {
+      const SendPacketVector& packets) OVERRIDE {
     return false;
   }
   virtual bool ResendPackets(
-      const transport::SendPacketVector& packets,
+      const SendPacketVector& packets,
       base::TimeDelta dedupe_window) OVERRIDE {
     return false;
   }
 
   virtual void CancelSendingPacket(
-      const transport::PacketKey& packet_key) OVERRIDE {
+      const PacketKey& packet_key) OVERRIDE {
   }
 
   void SetExpectedRtcpPacket(scoped_ptr<Packet> packet) {
@@ -114,7 +114,7 @@ TEST_F(RtcpSenderTest, RtcpReceiverReport) {
   test_transport_.SetExpectedRtcpPacket(p1.GetPacket());
 
   rtcp_sender_->SendRtcpFromRtpReceiver(
-      transport::kRtcpRr, NULL, NULL, NULL, NULL, kDefaultDelay);
+      kRtcpRr, NULL, NULL, NULL, NULL, kDefaultDelay);
 
   EXPECT_EQ(1, test_transport_.packet_count());
 
@@ -125,10 +125,10 @@ TEST_F(RtcpSenderTest, RtcpReceiverReport) {
   p2.AddSdesCname(kSendingSsrc, kCName);
   test_transport_.SetExpectedRtcpPacket(p2.GetPacket().Pass());
 
-  transport::RtcpReportBlock report_block = GetReportBlock();
+  RtcpReportBlock report_block = GetReportBlock();
 
   rtcp_sender_->SendRtcpFromRtpReceiver(
-      transport::kRtcpRr, &report_block, NULL, NULL, NULL, kDefaultDelay);
+      kRtcpRr, &report_block, NULL, NULL, NULL, kDefaultDelay);
 
   EXPECT_EQ(2, test_transport_.packet_count());
 }
@@ -143,14 +143,14 @@ TEST_F(RtcpSenderTest, RtcpReceiverReportWithRrtr) {
   p.AddXrRrtrBlock();
   test_transport_.SetExpectedRtcpPacket(p.GetPacket().Pass());
 
-  transport::RtcpReportBlock report_block = GetReportBlock();
+  RtcpReportBlock report_block = GetReportBlock();
 
   RtcpReceiverReferenceTimeReport rrtr;
   rrtr.ntp_seconds = kNtpHigh;
   rrtr.ntp_fraction = kNtpLow;
 
   rtcp_sender_->SendRtcpFromRtpReceiver(
-      transport::kRtcpRr | transport::kRtcpRrtr,
+      kRtcpRr | kRtcpRrtr,
       &report_block,
       &rrtr,
       NULL,
@@ -169,7 +169,7 @@ TEST_F(RtcpSenderTest, RtcpReceiverReportWithCast) {
   p.AddCast(kSendingSsrc, kMediaSsrc, kDefaultDelay);
   test_transport_.SetExpectedRtcpPacket(p.GetPacket().Pass());
 
-  transport::RtcpReportBlock report_block = GetReportBlock();
+  RtcpReportBlock report_block = GetReportBlock();
 
   RtcpCastMessage cast_message(kMediaSsrc);
   cast_message.ack_frame_id_ = kAckFrameId;
@@ -183,7 +183,7 @@ TEST_F(RtcpSenderTest, RtcpReceiverReportWithCast) {
       missing_packets;
 
   rtcp_sender_->SendRtcpFromRtpReceiver(
-      transport::kRtcpRr | transport::kRtcpCast,
+      kRtcpRr | kRtcpCast,
       &report_block,
       NULL,
       &cast_message,
@@ -203,7 +203,7 @@ TEST_F(RtcpSenderTest, RtcpReceiverReportWithRrtraAndCastMessage) {
   p.AddCast(kSendingSsrc, kMediaSsrc, kDefaultDelay);
   test_transport_.SetExpectedRtcpPacket(p.GetPacket().Pass());
 
-  transport::RtcpReportBlock report_block = GetReportBlock();
+  RtcpReportBlock report_block = GetReportBlock();
 
   RtcpReceiverReferenceTimeReport rrtr;
   rrtr.ntp_seconds = kNtpHigh;
@@ -221,7 +221,7 @@ TEST_F(RtcpSenderTest, RtcpReceiverReportWithRrtraAndCastMessage) {
       missing_packets;
 
   rtcp_sender_->SendRtcpFromRtpReceiver(
-      transport::kRtcpRr | transport::kRtcpRrtr | transport::kRtcpCast,
+      kRtcpRr | kRtcpRrtr | kRtcpCast,
       &report_block,
       &rrtr,
       &cast_message,
@@ -244,7 +244,7 @@ TEST_F(RtcpSenderTest, RtcpReceiverReportWithRrtrCastMessageAndLog) {
   p.AddCast(kSendingSsrc, kMediaSsrc, kDefaultDelay);
   test_transport_.SetExpectedRtcpPacket(p.GetPacket().Pass());
 
-  transport::RtcpReportBlock report_block = GetReportBlock();
+  RtcpReportBlock report_block = GetReportBlock();
 
   RtcpReceiverReferenceTimeReport rrtr;
   rrtr.ntp_seconds = kNtpHigh;
@@ -265,8 +265,8 @@ TEST_F(RtcpSenderTest, RtcpReceiverReportWithRrtrCastMessageAndLog) {
   ReceiverRtcpEventSubscriber::RtcpEventMultiMap rtcp_events;
 
   rtcp_sender_->SendRtcpFromRtpReceiver(
-      transport::kRtcpRr | transport::kRtcpRrtr | transport::kRtcpCast |
-          transport::kRtcpReceiverLog,
+      kRtcpRr | kRtcpRrtr | kRtcpCast |
+          kRtcpReceiverLog,
       &report_block,
       &rrtr,
       &cast_message,
@@ -302,8 +302,8 @@ TEST_F(RtcpSenderTest, RtcpReceiverReportWithRrtrCastMessageAndLog) {
   EXPECT_EQ(2u, rtcp_events.size());
 
   rtcp_sender_->SendRtcpFromRtpReceiver(
-      transport::kRtcpRr | transport::kRtcpRrtr | transport::kRtcpCast |
-          transport::kRtcpReceiverLog,
+      kRtcpRr | kRtcpRrtr | kRtcpCast |
+          kRtcpReceiverLog,
       &report_block,
       &rrtr,
       &cast_message,
@@ -322,7 +322,7 @@ TEST_F(RtcpSenderTest, RtcpReceiverReportWithOversizedFrameLog) {
   p.AddRb(kMediaSsrc);
   p.AddSdesCname(kSendingSsrc, kCName);
 
-  transport::RtcpReportBlock report_block = GetReportBlock();
+  RtcpReportBlock report_block = GetReportBlock();
 
   base::SimpleTestTickClock testing_clock;
   testing_clock.Advance(base::TimeDelta::FromMilliseconds(kTimeBaseMs));
@@ -371,7 +371,7 @@ TEST_F(RtcpSenderTest, RtcpReceiverReportWithOversizedFrameLog) {
   event_subscriber.GetRtcpEventsAndReset(&rtcp_events);
 
   rtcp_sender_->SendRtcpFromRtpReceiver(
-      transport::kRtcpRr | transport::kRtcpReceiverLog,
+      kRtcpRr | kRtcpReceiverLog,
       &report_block,
       NULL,
       NULL,
@@ -390,7 +390,7 @@ TEST_F(RtcpSenderTest, RtcpReceiverReportWithTooManyLogFrames) {
   p.AddRb(kMediaSsrc);
   p.AddSdesCname(kSendingSsrc, kCName);
 
-  transport::RtcpReportBlock report_block = GetReportBlock();
+  RtcpReportBlock report_block = GetReportBlock();
 
   base::SimpleTestTickClock testing_clock;
   testing_clock.Advance(base::TimeDelta::FromMilliseconds(kTimeBaseMs));
@@ -428,7 +428,7 @@ TEST_F(RtcpSenderTest, RtcpReceiverReportWithTooManyLogFrames) {
   event_subscriber.GetRtcpEventsAndReset(&rtcp_events);
 
   rtcp_sender_->SendRtcpFromRtpReceiver(
-      transport::kRtcpRr | transport::kRtcpReceiverLog,
+      kRtcpRr | kRtcpReceiverLog,
       &report_block,
       NULL,
       NULL,
@@ -446,7 +446,7 @@ TEST_F(RtcpSenderTest, RtcpReceiverReportWithOldLogFrames) {
   p.AddRb(kMediaSsrc);
   p.AddSdesCname(kSendingSsrc, kCName);
 
-  transport::RtcpReportBlock report_block = GetReportBlock();
+  RtcpReportBlock report_block = GetReportBlock();
 
   base::SimpleTestTickClock testing_clock;
   testing_clock.Advance(base::TimeDelta::FromMilliseconds(kTimeBaseMs));
@@ -479,7 +479,7 @@ TEST_F(RtcpSenderTest, RtcpReceiverReportWithOldLogFrames) {
   event_subscriber.GetRtcpEventsAndReset(&rtcp_events);
 
   rtcp_sender_->SendRtcpFromRtpReceiver(
-      transport::kRtcpRr | transport::kRtcpReceiverLog,
+      kRtcpRr | kRtcpReceiverLog,
       &report_block,
       NULL,
       NULL,
@@ -493,7 +493,7 @@ TEST_F(RtcpSenderTest, RtcpReceiverReportRedundancy) {
   uint32 time_base_ms = 12345678;
   int kTimeBetweenEventsMs = 10;
 
-  transport::RtcpReportBlock report_block = GetReportBlock();
+  RtcpReportBlock report_block = GetReportBlock();
 
   base::SimpleTestTickClock testing_clock;
   testing_clock.Advance(base::TimeDelta::FromMilliseconds(time_base_ms));
@@ -538,7 +538,7 @@ TEST_F(RtcpSenderTest, RtcpReceiverReportRedundancy) {
     event_subscriber.GetRtcpEventsAndReset(&rtcp_events);
 
     rtcp_sender_->SendRtcpFromRtpReceiver(
-        transport::kRtcpRr | transport::kRtcpReceiverLog,
+        kRtcpRr | kRtcpReceiverLog,
         &report_block,
         NULL,
         NULL,