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

media/cast/receiver/video_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 <cstdlib>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
 #include "base/time/time.h"
 #include "media/cast/cast_config.h"
-#include "media/cast/test/utility/default_config.h"
+#include "media/cast/receiver/video_decoder.h"
 #include "media/cast/test/utility/standalone_cast_environment.h"
 #include "media/cast/test/utility/video_utility.h"
-#include "media/cast/video_receiver/video_decoder.h"
 #include "media/cast/video_sender/codecs/vp8/vp8_encoder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 namespace cast {
 
 namespace {
 
 const int kWidth = 360;
 const int kHeight = 240;
@@ skipping 14 matching lines @@
  public:
   VideoDecoderTest()
       : cast_environment_(new StandaloneCastEnvironment()),
         vp8_encoder_(GetVideoSenderConfigForTest(), 0),
         cond_(&lock_) {
     vp8_encoder_.Initialize();
   }
 
  protected:
   virtual void SetUp() OVERRIDE {
-    FrameReceiverConfig decoder_config = GetDefaultVideoReceiverConfig();
-    decoder_config.codec.video = GetParam();
-    video_decoder_.reset(new VideoDecoder(cast_environment_, decoder_config));
+    video_decoder_.reset(new VideoDecoder(cast_environment_, GetParam()));
     CHECK_EQ(STATUS_VIDEO_INITIALIZED, video_decoder_->InitializationResult());
 
     next_frame_timestamp_ = base::TimeDelta();
     last_frame_id_ = 0;
     seen_a_decoded_frame_ = false;
 
     total_video_frames_feed_in_ = 0;
     total_video_frames_decoded_ = 0;
   }
 
@@ skipping 113 matching lines @@
   }
   WaitForAllVideoToBeDecoded();
 }
 
 INSTANTIATE_TEST_CASE_P(VideoDecoderTestScenarios,
                         VideoDecoderTest,
                         ::testing::Values(transport::kVp8));
 
 }  // namespace cast
 }  // namespace media