Cast: Reshuffle files under media/cast

media/cast/sender/audio_sender_unittest.cc

Index: media/cast/sender/audio_sender_unittest.cc
diff --git a/media/cast/audio_sender/audio_sender_unittest.cc b/media/cast/sender/audio_sender_unittest.cc
similarity index 86%
rename from media/cast/audio_sender/audio_sender_unittest.cc
rename to media/cast/sender/audio_sender_unittest.cc
index 69b6d85b83dfbe11f605fe4c304751e32f2d2634..7c39be0aaf0c8dc7f5dc46dce57816b349fd69b0 100644
--- a/media/cast/audio_sender/audio_sender_unittest.cc
+++ b/media/cast/sender/audio_sender_unittest.cc
@@ -9,24 +9,24 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "media/base/media.h"
-#include "media/cast/audio_sender/audio_sender.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_environment.h"
-#include "media/cast/rtcp/rtcp.h"
+#include "media/cast/net/cast_transport_config.h"
+#include "media/cast/net/cast_transport_sender_impl.h"
+#include "media/cast/net/rtcp/rtcp.h"
+#include "media/cast/sender/audio_sender.h"
 #include "media/cast/test/fake_single_thread_task_runner.h"
 #include "media/cast/test/utility/audio_utility.h"
-#include "media/cast/transport/cast_transport_config.h"
-#include "media/cast/transport/cast_transport_sender_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 namespace cast {
 
-class TestPacketSender : public transport::PacketSender {
+class TestPacketSender : public PacketSender {
  public:
   TestPacketSender() : number_of_rtp_packets_(0), number_of_rtcp_packets_(0) {}
 
-  virtual bool SendPacket(transport::PacketRef packet,
+  virtual bool SendPacket(PacketRef packet,
                           const base::Closure& cb) OVERRIDE {
     if (Rtcp::IsRtcpPacket(&packet->data[0], packet->data.size())) {
       ++number_of_rtcp_packets_;
@@ -65,7 +65,7 @@ class AudioSenderTest : public ::testing::Test {
                             task_runner_,
                             task_runner_,
                             task_runner_);
-    audio_config_.codec = transport::CODEC_AUDIO_OPUS;
+    audio_config_.codec = CODEC_AUDIO_OPUS;
     audio_config_.use_external_encoder = false;
     audio_config_.frequency = kDefaultAudioSamplingRate;
     audio_config_.channels = 2;
@@ -74,12 +74,12 @@ class AudioSenderTest : public ::testing::Test {
 
     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_));
@@ -90,13 +90,13 @@ class AudioSenderTest : public ::testing::Test {
 
   virtual ~AudioSenderTest() {}
 
-  static void UpdateCastTransportStatus(transport::CastTransportStatus status) {
-    EXPECT_EQ(transport::TRANSPORT_AUDIO_INITIALIZED, status);
+  static void UpdateCastTransportStatus(CastTransportStatus status) {
+    EXPECT_EQ(TRANSPORT_AUDIO_INITIALIZED, status);
   }
 
   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<AudioSender> audio_sender_;
   scoped_refptr<CastEnvironment> cast_environment_;