RELAND: Merge VideoSenderConfig and AudioSenderConfig.

media/cast/sender/audio_sender.h

 // 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.
 
 #ifndef MEDIA_CAST_SENDER_AUDIO_SENDER_H_
 #define MEDIA_CAST_SENDER_AUDIO_SENDER_H_
 
 #include <memory>
 
 #include "base/callback.h"
@@ skipping 17 matching lines @@
 // This class owns all objects related to sending audio, objects that create RTP
 // packets, congestion control, audio encoder, parsing and sending of
 // RTCP packets.
 // Additionally it posts a bunch of delayed tasks to the main thread for various
 // timeouts.
 class AudioSender : public FrameSender,
                     public base::NonThreadSafe,
                     public base::SupportsWeakPtr<AudioSender> {
  public:
   AudioSender(scoped_refptr<CastEnvironment> cast_environment,
-              const AudioSenderConfig& audio_config,
+              const FrameSenderConfig& audio_config,
               const StatusChangeCallback& status_change_cb,
               CastTransport* const transport_sender);
 
   ~AudioSender() final;
 
   // Note: It is not guaranteed that |audio_frame| will actually be encoded and
   // sent, if AudioSender detects too many frames in flight.  Therefore, clients
   // should be careful about the rate at which this method is called.
   void InsertAudio(std::unique_ptr<AudioBus> audio_bus,
                    const base::TimeTicks& recorded_time);
@@ skipping 17 matching lines @@
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<AudioSender> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioSender);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_SENDER_AUDIO_SENDER_H_