Cast:Adding cast_transport_config and cleaning up

media/cast/audio_sender/audio_encoder_unittest.cc

Index: media/cast/audio_sender/audio_encoder_unittest.cc
diff --git a/media/cast/audio_sender/audio_encoder_unittest.cc b/media/cast/audio_sender/audio_encoder_unittest.cc
index d721f71ef29960f17b4574f15bd48be484196b6d..a2e3191a6fef6a05b3f3dddf609e8b8aa5c79d1b 100644
--- a/media/cast/audio_sender/audio_encoder_unittest.cc
+++ b/media/cast/audio_sender/audio_encoder_unittest.cc
@@ -26,7 +26,7 @@ namespace {
 
 class TestEncodedAudioFrameReceiver {
  public:
-  explicit TestEncodedAudioFrameReceiver(AudioCodec codec) :
+  explicit TestEncodedAudioFrameReceiver(transport::AudioCodec codec) :
       codec_(codec), frames_received_(0) {}
   virtual ~TestEncodedAudioFrameReceiver() {}
 
@@ -42,7 +42,7 @@ class TestEncodedAudioFrameReceiver {
     upper_bound_ = t;
   }
 
-  void FrameEncoded(scoped_ptr<EncodedAudioFrame> encoded_frame,
+  void FrameEncoded(scoped_ptr<transport::EncodedAudioFrame> encoded_frame,
                     const base::TimeTicks& recorded_time) {
     EXPECT_EQ(codec_, encoded_frame->codec);
     EXPECT_EQ(static_cast<uint8>(frames_received_ & 0xff),
@@ -58,7 +58,7 @@ class TestEncodedAudioFrameReceiver {
   }
 
  private:
-  const AudioCodec codec_;
+  const transport::AudioCodec codec_;
   int frames_received_;
   base::TimeTicks lower_bound_;
   base::TimeTicks upper_bound_;
@@ -97,13 +97,13 @@ class AudioEncoderTest : public ::testing::TestWithParam<TestScenario> {
   virtual void SetUp() {
     task_runner_ = new test::FakeTaskRunner(&testing_clock_);
     cast_environment_ = new CastEnvironment(&testing_clock_, task_runner_,
-        task_runner_, task_runner_, task_runner_, task_runner_,
+        task_runner_, task_runner_, task_runner_, task_runner_, task_runner_,
         GetDefaultCastLoggingConfig());
   }
 
   virtual ~AudioEncoderTest() {}
 
-  void RunTestForCodec(AudioCodec codec) {
+  void RunTestForCodec(transport::AudioCodec codec) {
     const TestScenario& scenario = GetParam();
     SCOPED_TRACE(::testing::Message()
                  << "Durations: " << scenario.ToString());
@@ -137,7 +137,7 @@ class AudioEncoderTest : public ::testing::TestWithParam<TestScenario> {
   }
 
  private:
-  void CreateObjectsForCodec(AudioCodec codec) {
+  void CreateObjectsForCodec(transport::AudioCodec codec) {
     AudioSenderConfig audio_config;
     audio_config.codec = codec;
     audio_config.use_external_encoder = false;
@@ -175,11 +175,11 @@ class AudioEncoderTest : public ::testing::TestWithParam<TestScenario> {
 };
 
 TEST_P(AudioEncoderTest, EncodeOpus) {
-  RunTestForCodec(kOpus);
+  RunTestForCodec(transport::kOpus);
 }
 
 TEST_P(AudioEncoderTest, EncodePcm16) {
-  RunTestForCodec(kPcm16);
+  RunTestForCodec(transport::kPcm16);
 }
 
 static const int64 kOneCall_3Millis[] = { 3 };