Cast: Reshuffle files under media/cast

media/cast/sender/audio_encoder_unittest.cc

Index: media/cast/sender/audio_encoder_unittest.cc
diff --git a/media/cast/audio_sender/audio_encoder_unittest.cc b/media/cast/sender/audio_encoder_unittest.cc
similarity index 94%
rename from media/cast/audio_sender/audio_encoder_unittest.cc
rename to media/cast/sender/audio_encoder_unittest.cc
index 60d242c946ff672c00491ab2359d065e82e7f8cc..b1699a831e99119c12c232cff837c35c568042c2 100644
--- a/media/cast/audio_sender/audio_encoder_unittest.cc
+++ b/media/cast/sender/audio_encoder_unittest.cc
@@ -12,8 +12,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "media/base/audio_bus.h"
 #include "media/base/media.h"
-#include "media/cast/audio_sender/audio_encoder.h"
 #include "media/cast/cast_environment.h"
+#include "media/cast/sender/audio_encoder.h"
 #include "media/cast/test/fake_single_thread_task_runner.h"
 #include "media/cast/test/utility/audio_utility.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -27,7 +27,7 @@ namespace {
 
 class TestEncodedAudioFrameReceiver {
  public:
-  explicit TestEncodedAudioFrameReceiver(transport::Codec codec)
+  explicit TestEncodedAudioFrameReceiver(Codec codec)
       : codec_(codec), frames_received_(0), rtp_lower_bound_(0) {}
   virtual ~TestEncodedAudioFrameReceiver() {}
 
@@ -39,8 +39,8 @@ class TestEncodedAudioFrameReceiver {
     upper_bound_ = upper_bound;
   }
 
-  void FrameEncoded(scoped_ptr<transport::EncodedFrame> encoded_frame) {
-    EXPECT_EQ(encoded_frame->dependency, transport::EncodedFrame::KEY);
+  void FrameEncoded(scoped_ptr<EncodedFrame> encoded_frame) {
+    EXPECT_EQ(encoded_frame->dependency, EncodedFrame::KEY);
     EXPECT_EQ(static_cast<uint8>(frames_received_ & 0xff),
               encoded_frame->frame_id);
     EXPECT_EQ(encoded_frame->frame_id, encoded_frame->referenced_frame_id);
@@ -61,7 +61,7 @@ class TestEncodedAudioFrameReceiver {
   }
 
  private:
-  const transport::Codec codec_;
+  const Codec codec_;
   int frames_received_;
   uint32 rtp_lower_bound_;
   base::TimeTicks lower_bound_;
@@ -109,7 +109,7 @@ class AudioEncoderTest : public ::testing::TestWithParam<TestScenario> {
 
   virtual ~AudioEncoderTest() {}
 
-  void RunTestForCodec(transport::Codec codec) {
+  void RunTestForCodec(Codec codec) {
     const TestScenario& scenario = GetParam();
     SCOPED_TRACE(::testing::Message() << "Durations: " << scenario.ToString());
 
@@ -142,7 +142,7 @@ class AudioEncoderTest : public ::testing::TestWithParam<TestScenario> {
   }
 
  private:
-  void CreateObjectsForCodec(transport::Codec codec) {
+  void CreateObjectsForCodec(Codec codec) {
     audio_bus_factory_.reset(
         new TestAudioBusFactory(kNumChannels,
                                 kDefaultAudioSamplingRate,
@@ -172,11 +172,11 @@ class AudioEncoderTest : public ::testing::TestWithParam<TestScenario> {
 };
 
 TEST_P(AudioEncoderTest, EncodeOpus) {
-  RunTestForCodec(transport::CODEC_AUDIO_OPUS);
+  RunTestForCodec(CODEC_AUDIO_OPUS);
 }
 
 TEST_P(AudioEncoderTest, EncodePcm16) {
-  RunTestForCodec(transport::CODEC_AUDIO_PCM16);
+  RunTestForCodec(CODEC_AUDIO_PCM16);
 }
 
 static const int64 kOneCall_3Millis[] = {3};