Update Android IPC messages to EME WD

content/common/media/media_player_messages_android.h

Index: content/common/media/media_player_messages_android.h
diff --git a/content/common/media/media_player_messages_android.h b/content/common/media/media_player_messages_android.h
index 054fb22107c0cd3ec55da67751259b8ebbe885ca..d125608ff01add42a3742ac49f6fa4d5dad57ab2 100644
--- a/content/common/media/media_player_messages_android.h
+++ b/content/common/media/media_player_messages_android.h
@@ -287,39 +287,42 @@ IPC_MESSAGE_ROUTED3(MediaKeysHostMsg_InitializeCDM,
                     std::vector<uint8> /* uuid */,

[palmer, 2013/12/06 19:07:32]

OnInitializeCDM should verify that this is a real UUID (correct size, at least),
and reject messages that don't have real UUIDs.

[jrummell, 2013/12/06 23:36:12]

Done.

                     GURL /* frame url */)
 
-IPC_MESSAGE_ROUTED4(MediaKeysHostMsg_GenerateKeyRequest,
+IPC_MESSAGE_ROUTED4(MediaKeysHostMsg_CreateSession,
                     int /* media_keys_id */,
                     uint32_t /* reference_id */,
                     std::string /* type */,

[palmer, 2013/12/06 19:07:32]

What is the range of values for this string?

[jrummell, 2013/12/06 23:36:12]

It's a MIME type, possibly with codecs specified.

                     std::vector<uint8> /* init_data */)

[palmer, 2013/12/06 19:07:32]

What is in this vector?

[jrummell, 2013/12/06 23:36:12]

https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-...

 
-IPC_MESSAGE_ROUTED4(MediaKeysHostMsg_AddKey,
+IPC_MESSAGE_ROUTED3(MediaKeysHostMsg_UpdateSession,
                     int /* media_keys_id */,
                     uint32_t /* reference_id */,
-                    std::vector<uint8> /* key */,
-                    std::vector<uint8> /* init_data */)
-
-IPC_MESSAGE_ROUTED2(MediaKeysHostMsg_CancelKeyRequest,
-                    int /* media_keys_id */,
-                    uint32_t /* reference_id */)
+                    std::vector<uint8> /* response */)

[palmer, 2013/12/06 19:07:32]

What is in this vector?

[jrummell, 2013/12/06 23:36:12]

This is a message from the server to the decryption engine (e.g. license).

 
-IPC_MESSAGE_ROUTED2(MediaKeysMsg_KeyAdded,
+IPC_MESSAGE_ROUTED2(MediaKeysHostMsg_ReleaseSession,
                     int /* media_keys_id */,
                     uint32_t /* reference_id */)
 
-IPC_MESSAGE_ROUTED4(MediaKeysMsg_KeyError,
+IPC_MESSAGE_ROUTED3(MediaKeysMsg_SessionCreated,
                     int /* media_keys_id */,
                     uint32_t /* reference_id */,
-                    media::MediaKeys::KeyError /* error_code */,
-                    int /* system_code */)
+                    std::string /* web_session_id */)

[palmer, 2013/12/06 19:07:32]

Does this really have to be a string? We disprefer blob types in IPC messages.

[jrummell, 2013/12/06 23:36:12]

This is going from the browser to the renderer. Is this still a concern? Is a
vector better? Definition:
https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-...

 
-IPC_MESSAGE_ROUTED4(MediaKeysMsg_KeyMessage,
+IPC_MESSAGE_ROUTED4(MediaKeysMsg_SessionMessage,
                     int /* media_keys_id */,
                     uint32_t /* reference_id */,
                     std::vector<uint8> /* message */,

[palmer, 2013/12/06 19:07:32]

What is in this vector?

[jrummell, 2013/12/06 23:36:12]

This is a message from the CDM to the server(renderer).

                     std::string /* destination_url */)

[palmer, 2013/12/06 19:07:32]

Use a GURL instead of a string.

[jrummell, 2013/12/06 23:36:12]

Good idea. Suggest another CL to do this, as it has bigger impact than just
these few files where I'm mostly renaming existing calls. Opened
http://crbug.com/326663 to track this.

 
-IPC_MESSAGE_ROUTED3(MediaKeysMsg_SetSessionId,
+IPC_MESSAGE_ROUTED2(MediaKeysMsg_SessionReady,
+                    int /* media_keys_id */,
+                    uint32_t /* reference_id */)
+
+IPC_MESSAGE_ROUTED2(MediaKeysMsg_SessionClosed,
+                    int /* media_keys_id */,
+                    uint32_t /* reference_id */)
+
+IPC_MESSAGE_ROUTED4(MediaKeysMsg_SessionError,
                     int /* media_keys_id */,
                     uint32_t /* reference_id */,
-                    std::string /* session_id */)
+                    media::MediaKeys::KeyError /* error_code */,
+                    int /* system_code */)