Reland r253665 "Rename MediaKeys*Msg to Cdm*Msg."

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>
 
 #include "base/basictypes.h"
 #include "base/time/time.h"
 #include "content/common/content_export.h"
 #include "content/common/media/media_player_messages_enums_android.h"
 #include "ipc/ipc_message_macros.h"
 #include "media/base/android/media_player_android.h"
 #include "media/base/android/demuxer_stream_player_params.h"
 #include "media/base/media_keys.h"
 #include "ui/gfx/rect_f.h"
 #include "url/gurl.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 #define IPC_MESSAGE_START MediaPlayerMsgStart
 
 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::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)
@@ skipping 18 matching lines @@
   IPC_STRUCT_TRAITS_MEMBER(iv)
   IPC_STRUCT_TRAITS_MEMBER(subsamples)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry)
   IPC_STRUCT_TRAITS_MEMBER(clear_bytes)
   IPC_STRUCT_TRAITS_MEMBER(cypher_bytes)
 IPC_STRUCT_TRAITS_END()
 
 IPC_ENUM_TRAITS(MediaPlayerHostMsg_Initialize_Type)
-IPC_ENUM_TRAITS(MediaKeysHostMsg_CreateSession_Type)
 
 // Chrome for Android seek message sequence is:
 // 1. Renderer->Browser MediaPlayerHostMsg_Seek
 //    This is the beginning of actual seek flow in response to web app requests
 //    for seeks and browser MediaPlayerMsg_SeekRequests. With this message,
 //    the renderer asks browser to perform actual seek. At most one of these
 //    actual seeks will be in process between this message and renderer's later
 //    receipt of MediaPlayerMsg_SeekCompleted from the browser.
 // 2. Browser->Renderer MediaPlayerMsg_SeekCompleted
 //    Once the browser determines the seek is complete, it sends this message to
@@ skipping 199 matching lines @@
 // |is_request| true if the player is requesting the external surface.
 // |rect| the boundary rectangle of the video element.
 IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_NotifyExternalSurface,
                     int /* player_id */,
                     bool /* is_request */,
                     gfx::RectF /* rect */)
 #endif  // defined(VIDEO_HOLE)
 
 // Messages for encrypted media extensions API ------------------------------
 // TODO(xhwang): Move the following messages to a separate file.
+#undef IPC_MESSAGE_START
+#define IPC_MESSAGE_START CdmMsgStart
 
-IPC_MESSAGE_ROUTED3(MediaKeysHostMsg_InitializeCDM,
+IPC_ENUM_TRAITS(media::MediaKeys::KeyError)
+IPC_ENUM_TRAITS(CdmHostMsg_CreateSession_Type)
+
+IPC_MESSAGE_ROUTED3(CdmHostMsg_InitializeCDM,
                     int /* media_keys_id */,
                     std::vector<uint8> /* uuid */,
                     GURL /* frame url */)
 
-IPC_MESSAGE_ROUTED4(MediaKeysHostMsg_CreateSession,
+IPC_MESSAGE_ROUTED4(CdmHostMsg_CreateSession,
                     int /* media_keys_id */,
                     uint32_t /* session_id */,
-                    MediaKeysHostMsg_CreateSession_Type /* type */,
+                    CdmHostMsg_CreateSession_Type /* type */,
                     std::vector<uint8> /* init_data */)
 
-IPC_MESSAGE_ROUTED3(MediaKeysHostMsg_UpdateSession,
+IPC_MESSAGE_ROUTED3(CdmHostMsg_UpdateSession,
                     int /* media_keys_id */,
                     uint32_t /* session_id */,
                     std::vector<uint8> /* response */)
 
-IPC_MESSAGE_ROUTED2(MediaKeysHostMsg_ReleaseSession,
+IPC_MESSAGE_ROUTED2(CdmHostMsg_ReleaseSession,
                     int /* media_keys_id */,
                     uint32_t /* session_id */)
 
-IPC_MESSAGE_ROUTED1(MediaKeysHostMsg_DestroyCdm,
+IPC_MESSAGE_ROUTED1(CdmHostMsg_DestroyCdm,
                     int /* media_keys_id */)
 
-IPC_MESSAGE_ROUTED3(MediaKeysMsg_SessionCreated,
+IPC_MESSAGE_ROUTED3(CdmMsg_SessionCreated,
                     int /* media_keys_id */,
                     uint32_t /* session_id */,
                     std::string /* web_session_id */)
 
-IPC_MESSAGE_ROUTED4(MediaKeysMsg_SessionMessage,
+IPC_MESSAGE_ROUTED4(CdmMsg_SessionMessage,
                     int /* media_keys_id */,
                     uint32_t /* session_id */,
                     std::vector<uint8> /* message */,
                     GURL /* destination_url */)
 
-IPC_MESSAGE_ROUTED2(MediaKeysMsg_SessionReady,
+IPC_MESSAGE_ROUTED2(CdmMsg_SessionReady,
                     int /* media_keys_id */,
                     uint32_t /* session_id */)
 
-IPC_MESSAGE_ROUTED2(MediaKeysMsg_SessionClosed,
+IPC_MESSAGE_ROUTED2(CdmMsg_SessionClosed,
                     int /* media_keys_id */,
                     uint32_t /* session_id */)
 
-IPC_MESSAGE_ROUTED4(MediaKeysMsg_SessionError,
+IPC_MESSAGE_ROUTED4(CdmMsg_SessionError,
                     int /* media_keys_id */,
                     uint32_t /* session_id */,
                     media::MediaKeys::KeyError /* error_code */,
                     int /* system_code */)