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

content/common/media/media_player_messages_android.h

 // Copyright (c) 2012 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.
 
 // IPC messages for android media player.
 // Multiply-included message file, hence no include guard.
 
 #include <string>
 #include <vector>
 
@@ skipping 11 matching lines @@
 #define IPC_MESSAGE_START MediaPlayerMsgStart
 
 #include "media/base/android/demuxer_stream_player_params.h"
 
 IPC_ENUM_TRAITS(media::AudioCodec)
 IPC_ENUM_TRAITS(media::DemuxerStream::Status)
 IPC_ENUM_TRAITS(media::DemuxerStream::Type)
 IPC_ENUM_TRAITS(media::MediaKeys::KeyError)
 IPC_ENUM_TRAITS(media::VideoCodec)
 
-IPC_STRUCT_TRAITS_BEGIN(media::MediaPlayerHostMsg_DemuxerReady_Params)
+IPC_STRUCT_TRAITS_BEGIN(media::DemuxerConfigs)
   IPC_STRUCT_TRAITS_MEMBER(audio_codec)
   IPC_STRUCT_TRAITS_MEMBER(audio_channels)
   IPC_STRUCT_TRAITS_MEMBER(audio_sampling_rate)
   IPC_STRUCT_TRAITS_MEMBER(is_audio_encrypted)
   IPC_STRUCT_TRAITS_MEMBER(audio_extra_data)
 
   IPC_STRUCT_TRAITS_MEMBER(video_codec)
   IPC_STRUCT_TRAITS_MEMBER(video_size)
   IPC_STRUCT_TRAITS_MEMBER(is_video_encrypted)
   IPC_STRUCT_TRAITS_MEMBER(video_extra_data)
 
   IPC_STRUCT_TRAITS_MEMBER(duration_ms)
   IPC_STRUCT_TRAITS_MEMBER(key_system)
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params)
+IPC_STRUCT_TRAITS_BEGIN(media::DemuxerData)
   IPC_STRUCT_TRAITS_MEMBER(type)
   IPC_STRUCT_TRAITS_MEMBER(access_units)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(media::AccessUnit)
   IPC_STRUCT_TRAITS_MEMBER(status)
   IPC_STRUCT_TRAITS_MEMBER(end_of_stream)
   IPC_STRUCT_TRAITS_MEMBER(data)
   IPC_STRUCT_TRAITS_MEMBER(timestamp)
   IPC_STRUCT_TRAITS_MEMBER(key_id)
@@ skipping 126 matching lines @@
 IPC_MESSAGE_ROUTED1(MediaPlayerHostMsg_ExitFullscreen, int /* player_id */)
 
 // Sent when the seek request is received by the WebMediaPlayerAndroid.
 IPC_MESSAGE_ROUTED2(MediaPlayerHostMsg_MediaSeekRequestAck,
                     int /* player_id */,
                     uint32 /* seek_request_id */)
 
 // Inform the media source player that the demuxer is ready.
 IPC_MESSAGE_ROUTED2(MediaPlayerHostMsg_DemuxerReady,
                     int /* player_id */,
-                    media::MediaPlayerHostMsg_DemuxerReady_Params)
+                    media::DemuxerConfigs)
 
 // Sent when the data was read from the ChunkDemuxer.
 IPC_MESSAGE_ROUTED2(MediaPlayerHostMsg_ReadFromDemuxerAck,
                     int /* player_id */,
-                    media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params)
+                    media::DemuxerData)
 
 // Inform the media source player of changed media duration from demuxer.
 IPC_MESSAGE_ROUTED2(MediaPlayerHostMsg_DurationChanged,
                     int /* player_id */,
                     base::TimeDelta /* duration */)
 
 #if defined(GOOGLE_TV)
 // Notify the player about the external surface, requesting it if necessary.
 IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_NotifyExternalSurface,
                     int /* player_id */,
@@ skipping 32 matching lines @@
                     int /* media_keys_id */,
                     std::string /* session_id */,
                     media::MediaKeys::KeyError /* error_code */,
                     int /* system_code */)
 
 IPC_MESSAGE_ROUTED4(MediaKeysMsg_KeyMessage,
                     int /* media_keys_id */,
                     std::string /* session_id */,
                     std::vector<uint8> /* message */,
                     std::string /* destination_url */)