Rename MediaPlayerHostMsg_{DemuxerReady,ReadFromDemuxerAck}_Params to Media{Configs,Data}.

content/renderer/media/android/media_source_delegate.h

Index: content/renderer/media/android/media_source_delegate.h
diff --git a/content/renderer/media/android/media_source_delegate.h b/content/renderer/media/android/media_source_delegate.h
index 590fa159234bb2291981735b8a222cb38d60ab37..eef5351552af0c80ada7783d5e6e302a9ba117b1 100644
--- a/content/renderer/media/android/media_source_delegate.h
+++ b/content/renderer/media/android/media_source_delegate.h
@@ -25,8 +25,8 @@ class DecoderBuffer;
 class DecryptingDemuxerStream;
 class DemuxerStream;
 class MediaLog;
-struct MediaPlayerHostMsg_DemuxerReady_Params;
-struct MediaPlayerHostMsg_ReadFromDemuxerAck_Params;
+struct MediaConfigs;
+struct MediaData;
 }
 
 namespace content {
@@ -93,12 +93,10 @@ class MediaSourceDelegate : public media::DemuxerHost {
   void Destroy();
 
  private:
-  typedef base::Callback<void(
-      scoped_ptr<media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params> params)>
-          ReadFromDemuxerAckCB;
-  typedef base::Callback<void(
-      scoped_ptr<media::MediaPlayerHostMsg_DemuxerReady_Params> params)>
-          DemuxerReadyCB;
+  typedef base::Callback<void(scoped_ptr<media::MediaData> data)>
+      ReadFromDemuxerAckCB;
+  typedef base::Callback<void(scoped_ptr<media::MediaConfigs> configs)>
+      DemuxerReadyCB;
 
   // This is private to enforce use of the Destroyer.
   virtual ~MediaSourceDelegate();
@@ -148,8 +146,7 @@ class MediaSourceDelegate : public media::DemuxerHost {
                                               const std::string& language);
   void NotifyDemuxerReady();
   bool CanNotifyDemuxerReady();
-  void SendDemuxerReady(
-      scoped_ptr<media::MediaPlayerHostMsg_DemuxerReady_Params> params);
+  void SendDemuxerReady(scoped_ptr<media::MediaConfigs> configs);
 
   void StopDemuxer();
   void InitializeDemuxer();
@@ -157,19 +154,16 @@ class MediaSourceDelegate : public media::DemuxerHost {
   void OnReadFromDemuxerInternal(media::DemuxerStream::Type type);
   // Reads an access unit from the demuxer stream |stream| and stores it in
   // the |index|th access unit in |params|.
-  void ReadFromDemuxerStream(
-      media::DemuxerStream::Type type,
-      scoped_ptr<media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params> params,
-      size_t index);
-  void OnBufferReady(
-      media::DemuxerStream::Type type,
-      scoped_ptr<media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params> params,
-      size_t index,
-      media::DemuxerStream::Status status,
-      const scoped_refptr<media::DecoderBuffer>& buffer);
-
-  void SendReadFromDemuxerAck(
-      scoped_ptr<media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params> params);
+  void ReadFromDemuxerStream(media::DemuxerStream::Type type,
+                             scoped_ptr<media::MediaData> data,
+                             size_t index);
+  void OnBufferReady(media::DemuxerStream::Type type,
+                     scoped_ptr<media::MediaData> data,
+                     size_t index,
+                     media::DemuxerStream::Status status,
+                     const scoped_refptr<media::DecoderBuffer>& buffer);
+
+  void SendReadFromDemuxerAck(scoped_ptr<media::MediaData> data);
 
   // Helper function for calculating duration.
   int GetDurationMs();