[Cast] Clean-up: Merge AudioReceiverConfig+VideoReceiverConfig-->FrameReceiverConfig.

media/cast/audio_receiver/audio_decoder_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
 #include "base/sys_byteorder.h"
 #include "base/time/time.h"
 #include "media/cast/audio_receiver/audio_decoder.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/test/utility/audio_utility.h"
+#include "media/cast/test/utility/default_config.h"
 #include "media/cast/test/utility/standalone_cast_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/opus/src/include/opus.h"
 
 namespace media {
 namespace cast {
 
 namespace {
 struct TestScenario {
   transport::AudioCodec codec;
   int num_channels;
   int sampling_rate;
 
   TestScenario(transport::AudioCodec c, int n, int s)
       : codec(c), num_channels(n), sampling_rate(s) {}
 };
 }  // namespace
 
 class AudioDecoderTest : public ::testing::TestWithParam<TestScenario> {
  public:
   AudioDecoderTest()
       : cast_environment_(new StandaloneCastEnvironment()),
         cond_(&lock_) {}
 
  protected:
   virtual void SetUp() OVERRIDE {
-    AudioReceiverConfig decoder_config;
-    decoder_config.use_external_decoder = false;
+    FrameReceiverConfig decoder_config = GetDefaultAudioReceiverConfig();
     decoder_config.frequency = GetParam().sampling_rate;
     decoder_config.channels = GetParam().num_channels;
-    decoder_config.codec = GetParam().codec;
+    decoder_config.codec.audio = GetParam().codec;
     audio_decoder_.reset(new AudioDecoder(cast_environment_, decoder_config));
     CHECK_EQ(STATUS_AUDIO_INITIALIZED, audio_decoder_->InitializationResult());
 
     audio_bus_factory_.reset(
         new TestAudioBusFactory(GetParam().num_channels,
                                 GetParam().sampling_rate,
                                 TestAudioBusFactory::kMiddleANoteFreq,
                                 0.5f));
     last_frame_id_ = 0;
     seen_a_decoded_frame_ = false;
@@ skipping 179 matching lines @@
 INSTANTIATE_TEST_CASE_P(AudioDecoderTestScenarios,
                         AudioDecoderTest,
                         ::testing::Values(
                              TestScenario(transport::kPcm16, 1, 8000),
                              TestScenario(transport::kPcm16, 2, 48000),
                              TestScenario(transport::kOpus, 1, 8000),
                              TestScenario(transport::kOpus, 2, 48000)));
 
 }  // namespace cast
 }  // namespace media