Revert of Refactoring: Merge VideoSenderConfig and AudioSenderConfig.

media/cast/sender/video_sender_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 "media/cast/sender/video_sender.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 95 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestPacketSender);
 };
 
 void IgnorePlayoutDelayChanges(base::TimeDelta unused_playout_delay) {
 }
 
 class PeerVideoSender : public VideoSender {
  public:
   PeerVideoSender(
       scoped_refptr<CastEnvironment> cast_environment,
-      const FrameSenderConfig& video_config,
+      const VideoSenderConfig& video_config,
       const StatusChangeCallback& status_change_cb,
       const CreateVideoEncodeAcceleratorCallback& create_vea_cb,
       const CreateVideoEncodeMemoryCallback& create_video_encode_mem_cb,
       CastTransport* const transport_sender)
       : VideoSender(cast_environment,
                     video_config,
                     status_change_cb,
                     create_vea_cb,
                     create_video_encode_mem_cb,
                     transport_sender,
@@ skipping 44 matching lines @@
   ~VideoSenderTest() override {}
 
   void TearDown() final {
     video_sender_.reset();
     task_runner_->RunTasks();
   }
 
   // If |external| is true then external video encoder (VEA) is used.
   // |expect_init_success| is true if initialization is expected to succeed.
   void InitEncoder(bool external, bool expect_init_success) {
-    FrameSenderConfig video_config = GetDefaultVideoSenderConfig();
+    VideoSenderConfig video_config = GetDefaultVideoSenderConfig();
     video_config.use_external_encoder = external;
 
     ASSERT_EQ(operational_status_, STATUS_UNINITIALIZED);
 
     if (external) {
       vea_factory_.SetInitializationWillSucceed(expect_init_success);
       video_sender_.reset(new PeerVideoSender(
           cast_environment_, video_config,
           base::Bind(&SaveOperationalStatus, &operational_status_),
           base::Bind(
@@ skipping 443 matching lines @@
       video_frame,
       testing_clock_->NowTicks() + base::TimeDelta::FromMilliseconds(1000));
   RunTasks(33);
   transport_->SetPause(false);
   RunTasks(33);
   EXPECT_EQ(2, transport_->number_of_rtp_packets());
 }
 
 }  // namespace cast
 }  // namespace media