Cast: Reshuffle files under media/cast

media/cast/sender/video_sender_unittest.cc

Index: media/cast/sender/video_sender_unittest.cc
diff --git a/media/cast/video_sender/video_sender_unittest.cc b/media/cast/sender/video_sender_unittest.cc
similarity index 95%
rename from media/cast/video_sender/video_sender_unittest.cc
rename to media/cast/sender/video_sender_unittest.cc
index 8c4d366331bb4604f623aa4f797f5e838e99f7f5..25c202236856c5ead9e67994601c120e3476290e 100644
--- a/media/cast/video_sender/video_sender_unittest.cc
+++ b/media/cast/sender/video_sender_unittest.cc
@@ -12,14 +12,14 @@
 #include "media/base/video_frame.h"
 #include "media/cast/cast_environment.h"
 #include "media/cast/logging/simple_event_subscriber.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/sender/video_sender.h"
 #include "media/cast/test/fake_single_thread_task_runner.h"
 #include "media/cast/test/fake_video_encode_accelerator.h"
 #include "media/cast/test/utility/default_config.h"
 #include "media/cast/test/utility/video_utility.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 "media/cast/video_sender/video_sender.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -51,7 +51,7 @@ void CreateSharedMemory(
   callback.Run(shm.Pass());
 }
 
-class TestPacketSender : public transport::PacketSender {
+class TestPacketSender : public PacketSender {
  public:
   TestPacketSender()
       : number_of_rtp_packets_(0),
@@ -59,7 +59,7 @@ class TestPacketSender : public transport::PacketSender {
         paused_(false) {}
 
   // A singular packet implies a RTCP packet.
-  virtual bool SendPacket(transport::PacketRef packet,
+  virtual bool SendPacket(PacketRef packet,
                           const base::Closure& cb) OVERRIDE {
     if (paused_) {
       stored_packet_ = packet;
@@ -97,7 +97,7 @@ class TestPacketSender : public transport::PacketSender {
   int number_of_rtcp_packets_;
   bool paused_;
   base::Closure callback_;
-  transport::PacketRef stored_packet_;
+  PacketRef stored_packet_;
 
   DISALLOW_COPY_AND_ASSIGN(TestPacketSender);
 };
@@ -109,7 +109,7 @@ class PeerVideoSender : public VideoSender {
       const VideoSenderConfig& video_config,
       const CreateVideoEncodeAcceleratorCallback& create_vea_cb,
       const CreateVideoEncodeMemoryCallback& create_video_encode_mem_cb,
-      transport::CastTransportSender* const transport_sender)
+      CastTransportSender* const transport_sender)
       : VideoSender(cast_environment,
                     video_config,
                     create_vea_cb,
@@ -132,12 +132,12 @@ class VideoSenderTest : public ::testing::Test {
                             task_runner_);
     last_pixel_value_ = kPixelValue;
     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_,
         &transport_));
@@ -150,8 +150,8 @@ class VideoSenderTest : public ::testing::Test {
     task_runner_->RunTasks();
   }
 
-  static void UpdateCastTransportStatus(transport::CastTransportStatus status) {
-    EXPECT_EQ(transport::TRANSPORT_VIDEO_INITIALIZED, status);
+  static void UpdateCastTransportStatus(CastTransportStatus status) {
+    EXPECT_EQ(TRANSPORT_VIDEO_INITIALIZED, status);
   }
 
   void InitEncoder(bool external) {
@@ -170,7 +170,7 @@ class VideoSenderTest : public ::testing::Test {
     video_config.min_qp = 0;
     video_config.max_frame_rate = 30;
     video_config.max_number_of_video_buffers_used = 1;
-    video_config.codec = transport::CODEC_VIDEO_VP8;
+    video_config.codec = CODEC_VIDEO_VP8;
 
     if (external) {
       scoped_ptr<VideoEncodeAccelerator> fake_vea(
@@ -218,7 +218,7 @@ class VideoSenderTest : public ::testing::Test {
 
   base::SimpleTestTickClock* testing_clock_;  // Owned by CastEnvironment.
   TestPacketSender transport_;
-  scoped_ptr<transport::CastTransportSenderImpl> transport_sender_;
+  scoped_ptr<CastTransportSenderImpl> transport_sender_;
   scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_;
   scoped_ptr<PeerVideoSender> video_sender_;
   scoped_refptr<CastEnvironment> cast_environment_;