[Cast] EncodedAudioFrame+EncodedVideoFrame+reference_time --> EncodedFrame

media/cast/audio_receiver/audio_receiver.h

Index: media/cast/audio_receiver/audio_receiver.h
diff --git a/media/cast/audio_receiver/audio_receiver.h b/media/cast/audio_receiver/audio_receiver.h
index 5cc8f88f4cd44029d9b60d0da040bd48cdbb4f14..6ce01f63fbf7c794f2a1d6625f031e1d59787b96 100644
--- a/media/cast/audio_receiver/audio_receiver.h
+++ b/media/cast/audio_receiver/audio_receiver.h
@@ -76,7 +76,7 @@ class AudioReceiver : public RtpReceiver,
   //
   // The given |callback| is guaranteed to be run at some point in the future,
   // even if to respond with NULL at shutdown time.
-  void GetEncodedAudioFrame(const AudioFrameEncodedCallback& callback);
+  void GetEncodedAudioFrame(const FrameEncodedCallback& callback);
 
   // Deliver another packet, possibly a duplicate, and possibly out-of-order.
   void IncomingPacket(scoped_ptr<Packet> packet);
@@ -106,12 +106,11 @@ class AudioReceiver : public RtpReceiver,
   // EmitAvailableEncodedFrames().
   void EmitAvailableEncodedFramesAfterWaiting();
 
-  // Feeds an EncodedAudioFrame into |audio_decoder_|.  GetRawAudioFrame() uses
-  // this as a callback for GetEncodedAudioFrame().
+  // Feeds an EncodedFrame into |audio_decoder_|.  GetRawAudioFrame() uses this
+  // as a callback for GetEncodedAudioFrame().
   void DecodeEncodedAudioFrame(
       const AudioFrameDecodedCallback& callback,
-      scoped_ptr<transport::EncodedAudioFrame> encoded_frame,
-      const base::TimeTicks& playout_time);
+      scoped_ptr<transport::EncodedFrame> encoded_frame);
 
   // Return the playout time based on the current time and rtp timestamp.
   base::TimeTicks GetPlayoutTime(base::TimeTicks now, uint32 rtp_timestamp);
@@ -162,7 +161,7 @@ class AudioReceiver : public RtpReceiver,
   transport::TransportEncryptionHandler decryptor_;
 
   // Outstanding callbacks to run to deliver on client requests for frames.
-  std::list<AudioFrameEncodedCallback> frame_request_queue_;
+  std::list<FrameEncodedCallback> frame_request_queue_;
 
   // True while there's an outstanding task to re-invoke
   // EmitAvailableEncodedFrames().