Revert of Refactoring: Merge VideoSenderConfig and AudioSenderConfig.

media/cast/receiver/video_decoder_unittest.cc

 // Copyright 2014 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 <stdint.h>
 
 #include <cstdlib>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 13 matching lines @@
 
 namespace media {
 namespace cast {
 
 namespace {
 
 const int kStartingWidth = 360;
 const int kStartingHeight = 240;
 const int kFrameRate = 10;
 
-FrameSenderConfig GetVideoSenderConfigForTest() {
-  FrameSenderConfig config = GetDefaultVideoSenderConfig();
+VideoSenderConfig GetVideoSenderConfigForTest() {
+  VideoSenderConfig config = GetDefaultVideoSenderConfig();
   config.max_frame_rate = kFrameRate;
   return config;
 }
 
 }  // namespace
 
 class VideoDecoderTest : public ::testing::TestWithParam<Codec> {
  public:
   VideoDecoderTest()
       : cast_environment_(new StandaloneCastEnvironment()),
@@ skipping 188 matching lines @@
 
   WaitForAllVideoToBeDecoded();
 }
 
 INSTANTIATE_TEST_CASE_P(,
                         VideoDecoderTest,
                         ::testing::Values(CODEC_VIDEO_VP8));
 
 }  // namespace cast
 }  // namespace media