[Cast] Clean-up: Merge RtpReceiver+AudioReceiver+VideoReceiver-->FrameReceiver.

media/cast/receiver/audio_decoder_unittest.cc

Index: media/cast/receiver/audio_decoder_unittest.cc
diff --git a/media/cast/audio_receiver/audio_decoder_unittest.cc b/media/cast/receiver/audio_decoder_unittest.cc
similarity index 95%
rename from media/cast/audio_receiver/audio_decoder_unittest.cc
rename to media/cast/receiver/audio_decoder_unittest.cc
index 11973ab9a09448636083a17a009b449198447c61..83bc316b1f0dafde3165afc9a57f74c27633e447 100644
--- a/media/cast/audio_receiver/audio_decoder_unittest.cc
+++ b/media/cast/receiver/audio_decoder_unittest.cc
@@ -8,10 +8,9 @@
 #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/receiver/audio_decoder.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"
@@ -38,11 +37,10 @@ class AudioDecoderTest : public ::testing::TestWithParam<TestScenario> {
 
  protected:
   virtual void SetUp() OVERRIDE {
-    FrameReceiverConfig decoder_config = GetDefaultAudioReceiverConfig();
-    decoder_config.frequency = GetParam().sampling_rate;
-    decoder_config.channels = GetParam().num_channels;
-    decoder_config.codec.audio = GetParam().codec;
-    audio_decoder_.reset(new AudioDecoder(cast_environment_, decoder_config));
+    audio_decoder_.reset(new AudioDecoder(cast_environment_,
+                                          GetParam().num_channels,
+                                          GetParam().sampling_rate,
+                                          GetParam().codec));
     CHECK_EQ(STATUS_AUDIO_INITIALIZED, audio_decoder_->InitializationResult());
 
     audio_bus_factory_.reset(