[Cast] Clean-up: Merge AudioReceiverConfig+VideoReceiverConfig-->FrameReceiverConfig.

media/cast/cast_receiver.h

 // 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.
 //
 // This is the main interface for the cast receiver. All configuration are done
 // at creation.
 
 #ifndef MEDIA_CAST_CAST_RECEIVER_H_
 #define MEDIA_CAST_CAST_RECEIVER_H_
 
@@ skipping 52 matching lines @@
 
  private:
   friend class base::RefCountedThreadSafe<FrameReceiver>;
 };
 
 // This Class is thread safe.
 class CastReceiver {
  public:
   static scoped_ptr<CastReceiver> Create(
       scoped_refptr<CastEnvironment> cast_environment,
-      const AudioReceiverConfig& audio_config,
-      const VideoReceiverConfig& video_config,
+      const FrameReceiverConfig& audio_config,
+      const FrameReceiverConfig& video_config,
       transport::PacketSender* const packet_sender);
 
   // All received RTP and RTCP packets for the call should be sent to this
   // PacketReceiver. Can be called from any function.
   // TODO(hubbe): Replace with:
   //   virtual void ReceivePacket(scoped_ptr<Packet> packet) = 0;
   virtual transport::PacketReceiverCallback packet_receiver() = 0;
 
   // Polling interface to get audio and video frames from the CastReceiver.
   virtual scoped_refptr<FrameReceiver> frame_receiver() = 0;
 
   virtual ~CastReceiver() {}
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_CAST_RECEIVER_H_