Refactoring: Merge VideoSenderConfig and AudioSenderConfig.

media/cast/cast_sender_impl.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 "media/cast/cast_sender_impl.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 90 matching lines @@
 
 CastSenderImpl::CastSenderImpl(scoped_refptr<CastEnvironment> cast_environment,
                                CastTransport* const transport_sender)
     : cast_environment_(cast_environment),
       transport_sender_(transport_sender),
       weak_factory_(this) {
   CHECK(cast_environment.get());
 }
 
 void CastSenderImpl::InitializeAudio(
-    const AudioSenderConfig& audio_config,
+    const FrameSenderConfig& audio_config,
     const StatusChangeCallback& status_change_cb) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   CHECK(audio_config.use_external_encoder ||
         cast_environment_->HasAudioThread());
 
   VLOG(1) << "CastSenderImpl@" << this << "::InitializeAudio()";
 
   audio_sender_.reset(
       new AudioSender(cast_environment_,
                       audio_config,
                       base::Bind(&CastSenderImpl::OnAudioStatusChange,
                                  weak_factory_.GetWeakPtr(),
                                  status_change_cb),
                       transport_sender_));
   if (video_sender_) {
     DCHECK(audio_sender_->GetTargetPlayoutDelay() ==
            video_sender_->GetTargetPlayoutDelay());
   }
 }
 
 void CastSenderImpl::InitializeVideo(
-    const VideoSenderConfig& video_config,
+    const FrameSenderConfig& video_config,
     const StatusChangeCallback& status_change_cb,
     const CreateVideoEncodeAcceleratorCallback& create_vea_cb,
     const CreateVideoEncodeMemoryCallback& create_video_encode_mem_cb) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
 
   VLOG(1) << "CastSenderImpl@" << this << "::InitializeVideo()";
 
   video_sender_.reset(new VideoSender(
       cast_environment_,
       video_config,
@@ skipping 52 matching lines @@
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   if (status == STATUS_INITIALIZED && !video_frame_input_) {
     video_frame_input_ =
         new LocalVideoFrameInput(cast_environment_, video_sender_->AsWeakPtr());
   }
   status_change_cb.Run(status);
 }
 
 }  // namespace cast
 }  // namespace media