Update Android IPC messages to EME WD

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 269 matching lines @@
 #endif
 
 // Messages for encrypted media extensions API ------------------------------
 // TODO(xhwang): Move the following messages to a separate file.
 
 IPC_MESSAGE_ROUTED3(MediaKeysHostMsg_InitializeCDM,
                     int /* media_keys_id */,
                     std::vector<uint8> /* uuid */,
                     GURL /* frame url */)
 
-IPC_MESSAGE_ROUTED4(MediaKeysHostMsg_GenerateKeyRequest,
+IPC_MESSAGE_ROUTED4(MediaKeysHostMsg_CreateSession,
                     int /* media_keys_id */,
                     uint32_t /* session_id */,
                     std::string /* type */,
                     std::vector<uint8> /* init_data */)
+// TODO(jrummell): Use enum for type (http://crbug.com/327449)
 
-IPC_MESSAGE_ROUTED4(MediaKeysHostMsg_AddKey,
+IPC_MESSAGE_ROUTED3(MediaKeysHostMsg_UpdateSession,
                     int /* media_keys_id */,
                     uint32_t /* session_id */,
-                    std::vector<uint8> /* key */,
-                    std::vector<uint8> /* init_data */)
+                    std::vector<uint8> /* response */)
 
-IPC_MESSAGE_ROUTED2(MediaKeysHostMsg_CancelKeyRequest,
+IPC_MESSAGE_ROUTED2(MediaKeysHostMsg_ReleaseSession,
                     int /* media_keys_id */,
                     uint32_t /* session_id */)
 
-IPC_MESSAGE_ROUTED2(MediaKeysMsg_KeyAdded,
+IPC_MESSAGE_ROUTED3(MediaKeysMsg_SessionCreated,
+                    int /* media_keys_id */,
+                    uint32_t /* session_id */,
+                    std::string /* web_session_id */)
+
+IPC_MESSAGE_ROUTED4(MediaKeysMsg_SessionMessage,
+                    int /* media_keys_id */,
+                    uint32_t /* session_id */,
+                    std::vector<uint8> /* message */,
+                    std::string /* destination_url */)
+// TODO(jrummell): Use GURL for destination_url (http://crbug.com/326663)
+
+IPC_MESSAGE_ROUTED2(MediaKeysMsg_SessionReady,
                     int /* media_keys_id */,
                     uint32_t /* session_id */)
 
-IPC_MESSAGE_ROUTED4(MediaKeysMsg_KeyError,
+IPC_MESSAGE_ROUTED2(MediaKeysMsg_SessionClosed,
+                    int /* media_keys_id */,
+                    uint32_t /* session_id */)
+
+IPC_MESSAGE_ROUTED4(MediaKeysMsg_SessionError,
                     int /* media_keys_id */,
                     uint32_t /* session_id */,
                     media::MediaKeys::KeyError /* error_code */,
                     int /* system_code */)
-
-IPC_MESSAGE_ROUTED4(MediaKeysMsg_KeyMessage,
-                    int /* media_keys_id */,
-                    uint32_t /* session_id */,
-                    std::vector<uint8> /* message */,
-                    std::string /* destination_url */)
-
-IPC_MESSAGE_ROUTED3(MediaKeysMsg_SetSessionId,
-                    int /* media_keys_id */,
-                    uint32_t /* session_id */,
-                    std::string /* web_session_id */)