RELAND: Merge VideoSenderConfig and AudioSenderConfig.

chrome/renderer/media/cast_session.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 "chrome/renderer/media/cast_session.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 36 matching lines @@
 CastSession::CastSession()
     : delegate_(new CastSessionDelegate()),
       io_task_runner_(
           content::RenderThread::Get()->GetIOMessageLoopProxy()) {}
 
 CastSession::~CastSession() {
   // We should always be able to delete the object on the IO thread.
   CHECK(io_task_runner_->DeleteSoon(FROM_HERE, delegate_.release()));
 }
 
-void CastSession::StartAudio(const media::cast::AudioSenderConfig& config,
+void CastSession::StartAudio(const media::cast::FrameSenderConfig& config,
                              const AudioFrameInputAvailableCallback& callback,
                              const ErrorCallback& error_callback) {
   DCHECK(content::RenderThread::Get());
 
   io_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&CastSessionDelegate::StartAudio,
                  base::Unretained(delegate_.get()),
                  config,
                  media::BindToCurrentLoop(callback),
                  media::BindToCurrentLoop(error_callback)));
 }
 
-void CastSession::StartVideo(const media::cast::VideoSenderConfig& config,
+void CastSession::StartVideo(const media::cast::FrameSenderConfig& config,
                              const VideoFrameInputAvailableCallback& callback,
                              const ErrorCallback& error_callback) {
   DCHECK(content::RenderThread::Get());
 
   io_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&CastSessionDelegate::StartVideo,
                  base::Unretained(delegate_.get()),
                  config,
                  media::BindToCurrentLoop(callback),
@@ skipping 41 matching lines @@
 
 void CastSession::GetStatsAndReset(bool is_audio,
                                    const StatsCallback& callback) {
   io_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&CastSessionDelegate::GetStatsAndReset,
                  base::Unretained(delegate_.get()),
                  is_audio,
                  media::BindToCurrentLoop(callback)));
 }