Pass InitializeCDM() call through IPC to the browser.

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 efc313c47bbcc848e67f57efa2fd46d6df6a0796..0994a3776e9d3a4b5fb42b23069cd65ac6fb21cc 100644
--- a/content/common/media/media_player_messages_android.h
+++ b/content/common/media/media_player_messages_android.h
@@ -214,36 +214,39 @@ IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_NotifyExternalSurface,
 #endif
 
 // Messages for encrypted media extensions API ------------------------------
+// TODO(xhwang): Move the following messages to a separate file.
 
-IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_GenerateKeyRequest,
-                    int /* player_id */,
+IPC_MESSAGE_ROUTED2(MediaKeysHostMsg_InitializeCDM,
+                    int /* media_keys_id */,
+                    std::vector<uint8> /* uuid */)
+
+IPC_MESSAGE_ROUTED3(MediaKeysHostMsg_GenerateKeyRequest,
+                    int /* media_keys_id */,
                     std::string /* type */,
                     std::vector<uint8> /* init_data */)
 
-IPC_MESSAGE_ROUTED4(MediaPlayerHostMsg_AddKey,
-                    int /* player_id */,
+IPC_MESSAGE_ROUTED4(MediaKeysHostMsg_AddKey,
+                    int /* media_keys_id */,
                     std::vector<uint8> /* key */,
                     std::vector<uint8> /* init_data */,
                     std::string /* session_id */)
 
-IPC_MESSAGE_ROUTED2(MediaPlayerHostMsg_CancelKeyRequest,
-                    int /* player_id */,
+IPC_MESSAGE_ROUTED2(MediaKeysHostMsg_CancelKeyRequest,
+                    int /* media_keys_id */,
                     std::string /* session_id */)
 
-IPC_MESSAGE_ROUTED2(MediaPlayerMsg_KeyAdded,
-                    int /* player_id */,
+IPC_MESSAGE_ROUTED2(MediaKeysMsg_KeyAdded,
+                    int /* media_keys_id */,
                     std::string /* session_id */)
 
-IPC_MESSAGE_ROUTED4(MediaPlayerMsg_KeyError,
-                    int /* player_id */,
+IPC_MESSAGE_ROUTED4(MediaKeysMsg_KeyError,
+                    int /* media_keys_id */,
                     std::string /* session_id */,
                     media::MediaKeys::KeyError /* error_code */,
                     int /* system_code */)
 
-IPC_MESSAGE_ROUTED4(MediaPlayerMsg_KeyMessage,
-                    int /* player_id */,
+IPC_MESSAGE_ROUTED4(MediaKeysMsg_KeyMessage,
+                    int /* media_keys_id */,
                     std::string /* session_id */,
                     std::string /* message */,
                     std::string /* destination_url */)
-
-// NeedKey is fired and handled in the renderer. Hence no message is needed.