Cast: Reshuffle files under media/cast

media/cast/net/rtcp/rtcp_unittest.cc

Index: media/cast/net/rtcp/rtcp_unittest.cc
diff --git a/media/cast/rtcp/rtcp_unittest.cc b/media/cast/net/rtcp/rtcp_unittest.cc
similarity index 92%
rename from media/cast/rtcp/rtcp_unittest.cc
rename to media/cast/net/rtcp/rtcp_unittest.cc
index 157e81556ab7d88ccb8bf1d2032457441a2e257f..c343bcc8c664992dfaf289746e04cbccdee2d159 100644
--- a/media/cast/rtcp/rtcp_unittest.cc
+++ b/media/cast/net/rtcp/rtcp_unittest.cc
@@ -7,14 +7,14 @@
 #include "base/test/simple_test_tick_clock.h"
 #include "media/cast/cast_defines.h"
 #include "media/cast/cast_environment.h"
-#include "media/cast/rtcp/mock_rtcp_receiver_feedback.h"
-#include "media/cast/rtcp/mock_rtcp_sender_feedback.h"
-#include "media/cast/rtcp/rtcp.h"
-#include "media/cast/rtcp/test_rtcp_packet_builder.h"
+#include "media/cast/net/cast_transport_config.h"
+#include "media/cast/net/cast_transport_sender_impl.h"
+#include "media/cast/net/pacing/paced_sender.h"
+#include "media/cast/net/rtcp/mock_rtcp_receiver_feedback.h"
+#include "media/cast/net/rtcp/mock_rtcp_sender_feedback.h"
+#include "media/cast/net/rtcp/rtcp.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_config.h"
-#include "media/cast/transport/cast_transport_sender_impl.h"
-#include "media/cast/transport/pacing/paced_sender.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace media {
@@ -29,7 +29,7 @@ static const uint32 kRtcpIntervalMs = 500;
 static const int64 kAddedDelay = 123;
 static const int64 kAddedShortDelay = 100;
 
-class RtcpTestPacketSender : public transport::PacketSender {
+class RtcpTestPacketSender : public PacketSender {
  public:
   explicit RtcpTestPacketSender(base::SimpleTestTickClock* testing_clock)
       : drop_packets_(false),
@@ -45,7 +45,7 @@ class RtcpTestPacketSender : public transport::PacketSender {
   void set_drop_packets(bool drop_packets) { drop_packets_ = drop_packets; }
 
   // A singular packet implies a RTCP packet.
-  virtual bool SendPacket(transport::PacketRef packet,
+  virtual bool SendPacket(PacketRef packet,
                           const base::Closure& cb) OVERRIDE {
     if (short_delay_) {
       testing_clock_->Advance(
@@ -69,7 +69,7 @@ class RtcpTestPacketSender : public transport::PacketSender {
   DISALLOW_COPY_AND_ASSIGN(RtcpTestPacketSender);
 };
 
-class LocalRtcpTransport : public transport::PacedPacketSender {
+class LocalRtcpTransport : public PacedPacketSender {
  public:
   LocalRtcpTransport(scoped_refptr<CastEnvironment> cast_environment,
                      base::SimpleTestTickClock* testing_clock)
@@ -84,7 +84,7 @@ class LocalRtcpTransport : public transport::PacedPacketSender {
   void set_drop_packets(bool drop_packets) { drop_packets_ = drop_packets; }
 
   virtual bool SendRtcpPacket(uint32 ssrc,
-                              transport::PacketRef packet) OVERRIDE {
+                              PacketRef packet) OVERRIDE {
     if (short_delay_) {
       testing_clock_->Advance(
           base::TimeDelta::FromMilliseconds(kAddedShortDelay));
@@ -99,18 +99,18 @@ class LocalRtcpTransport : 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 {
   }
 
  private:
@@ -127,8 +127,8 @@ class RtcpPeer : public Rtcp {
  public:
   RtcpPeer(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,
@@ -165,16 +165,16 @@ class RtcpTest : public ::testing::Test {
         receiver_to_sender_(cast_environment_, testing_clock_) {
     testing_clock_->Advance(base::TimeTicks::Now() - base::TimeTicks());
     net::IPEndPoint dummy_endpoint;
-    transport_sender_.reset(new transport::CastTransportSenderImpl(
+    transport_sender_.reset(new CastTransportSenderImpl(
         NULL,
         testing_clock_,
         dummy_endpoint,
         base::Bind(&UpdateCastTransportStatus),
-        transport::BulkRawEventsCallback(),
+        BulkRawEventsCallback(),
         base::TimeDelta(),
         task_runner_,
         &sender_to_receiver_));
-    transport::CastTransportRtpConfig config;
+    CastTransportRtpConfig config;
     config.ssrc = kSenderSsrc;
     config.rtp_payload_type = 127;
     config.stored_frames = 1;
@@ -184,9 +184,9 @@ class RtcpTest : public ::testing::Test {
 
   virtual ~RtcpTest() {}
 
-  static void UpdateCastTransportStatus(transport::CastTransportStatus status) {
-    bool result = (status == transport::TRANSPORT_AUDIO_INITIALIZED ||
-                   status == transport::TRANSPORT_VIDEO_INITIALIZED);
+  static void UpdateCastTransportStatus(CastTransportStatus status) {
+    bool result = (status == TRANSPORT_AUDIO_INITIALIZED ||
+                   status == TRANSPORT_VIDEO_INITIALIZED);
     EXPECT_TRUE(result);
   }
 
@@ -202,7 +202,7 @@ class RtcpTest : public ::testing::Test {
   scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_;
   scoped_refptr<CastEnvironment> cast_environment_;
   RtcpTestPacketSender sender_to_receiver_;
-  scoped_ptr<transport::CastTransportSenderImpl> transport_sender_;
+  scoped_ptr<CastTransportSenderImpl> transport_sender_;
   LocalRtcpTransport receiver_to_sender_;
   MockRtcpSenderFeedback mock_sender_feedback_;