Separate CDM initialization from GenerateKeyRequest & remove key_system parameters.

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 "base/time.h"
@@ skipping 197 matching lines @@
 // Notify the player about the external surface, requesting it if necessary.
 IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_NotifyExternalSurface,
                     int /* player_id */,
                     bool /* is_request */,
                     gfx::RectF /* rect */)
 
 #endif
 
 // Messages for encrypted media extensions API ------------------------------
 
-IPC_MESSAGE_ROUTED4(MediaPlayerHostMsg_GenerateKeyRequest,
+IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_GenerateKeyRequest,
                     int /* player_id */,
-                    std::string /* key_system */,
                     std::string /* type */,
                     std::vector<uint8> /* init_data */)
 
-IPC_MESSAGE_ROUTED5(MediaPlayerHostMsg_AddKey,
+IPC_MESSAGE_ROUTED4(MediaPlayerHostMsg_AddKey,
                     int /* player_id */,
-                    std::string /* key_system */,
                     std::vector<uint8> /* key */,
                     std::vector<uint8> /* init_data */,
                     std::string /* session_id */)
 
-IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_CancelKeyRequest,
+IPC_MESSAGE_ROUTED2(MediaPlayerHostMsg_CancelKeyRequest,
                     int /* player_id */,
-                    std::string /* key_system */,
                     std::string /* session_id */)
 
-IPC_MESSAGE_ROUTED3(MediaPlayerMsg_KeyAdded,
+IPC_MESSAGE_ROUTED2(MediaPlayerMsg_KeyAdded,
                     int /* player_id */,
-                    std::string /* key_system */,
                     std::string /* session_id */)
 
-IPC_MESSAGE_ROUTED5(MediaPlayerMsg_KeyError,
+IPC_MESSAGE_ROUTED4(MediaPlayerMsg_KeyError,
                     int /* player_id */,
-                    std::string /* key_system */,
                     std::string /* session_id */,
                     media::MediaKeys::KeyError /* error_code */,
                     int /* system_code */)
 
-IPC_MESSAGE_ROUTED5(MediaPlayerMsg_KeyMessage,
+IPC_MESSAGE_ROUTED4(MediaPlayerMsg_KeyMessage,
                     int /* player_id */,
-                    std::string /* key_system */,
                     std::string /* session_id */,
                     std::string /* message */,
                     std::string /* destination_url */)
 
 // NeedKey is fired and handled in the renderer. Hence no message is needed.