Changes to the EME Pepper API

ppapi/proxy/ppapi_messages.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.
 
 // Multiply-included message header, no traditional include guard.
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
@@ skipping 639 matching lines @@
 
 #if !defined(OS_NACL) && !defined(NACL_WIN64)
 // PPB_Broker.
 IPC_MESSAGE_ROUTED3(
     PpapiMsg_PPBBroker_ConnectComplete,
     ppapi::HostResource /* broker */,
     IPC::PlatformFileForTransit /* handle */,
     int32_t /* result */)
 
 // PPP_ContentDecryptor_Dev
-IPC_MESSAGE_ROUTED4(PpapiMsg_PPPContentDecryptor_GenerateKeyRequest,
+IPC_MESSAGE_ROUTED2(PpapiMsg_PPPContentDecryptor_Initialize,
                     PP_Instance /* instance */,
-                    ppapi::proxy::SerializedVar /* key_system, String */,
+                    ppapi::proxy::SerializedVar /* key_system, String */)
+IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_GenerateKeyRequest,
+                    PP_Instance /* instance */,
                     ppapi::proxy::SerializedVar /* type, String */,
                     ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */)
 IPC_MESSAGE_ROUTED4(PpapiMsg_PPPContentDecryptor_AddKey,
                     PP_Instance /* instance */,
                     ppapi::proxy::SerializedVar /* session_id, String */,
                     ppapi::proxy::SerializedVar /* key, ArrayBuffer */,
                     ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */)
 IPC_MESSAGE_ROUTED2(PpapiMsg_PPPContentDecryptor_CancelKeyRequest,
                     PP_Instance /* instance */,
                     ppapi::proxy::SerializedVar /* session_id, String */)
@@ skipping 353 matching lines @@
     PP_Instance /* instance */,
     uint32_t /* size */,
     ppapi::HostResource /* result_resource */,
     ppapi::proxy::SerializedHandle /* result_shm_handle */)
 
 // PPB_ContentDecryptor_Dev messages handled in PPB_Instance_Proxy.
 IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBInstance_NeedKey,
                     PP_Instance /* instance */,
                     ppapi::proxy::SerializedVar /* key_system, String */,
                     ppapi::proxy::SerializedVar /* session_id, String */,
                     ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */)

[xhwang, 2013/09/18 00:07:18]

Shall we remove this?  I ran grep and got the following. Just make sure we
remove all NeedKeys.

./c/private/ppb_content_decryptor_private.h:69:  void (*NeedKey)(PP_Instance
instance,
./cpp/private/content_decryptor_private.cc:217:void
ContentDecryptor_Private::NeedKey(const std::string& key_system,
./cpp/private/content_decryptor_private.cc:225:   
get_interface<PPB_ContentDecryptor_Private>()->NeedKey(
./cpp/private/content_decryptor_private.h:61:  void NeedKey(const std::string&
key_system,
./api/private/ppb_content_decryptor_private.idl:49:  void NeedKey(
./thunk/ppb_instance_api.h:145:  virtual void NeedKey(PP_Instance instance,
./thunk/ppb_content_decryptor_private_thunk.cc:21:void NeedKey(PP_Instance
instance,
./thunk/ppb_content_decryptor_private_thunk.cc:25:  VLOG(4) <<
"PPB_ContentDecryptor_Private::NeedKey()";
./thunk/ppb_content_decryptor_private_thunk.cc:29: 
enter.functions()->NeedKey(instance, key_system, session_id, init_data);
./thunk/ppb_content_decryptor_private_thunk.cc:149:  &NeedKey,
./proxy/ppapi_messages.h:1036:IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBInstance_NeedKey,
./proxy/ppb_instance_proxy.cc:178:   
IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_NeedKey,
./proxy/ppb_instance_proxy.cc:179:                        OnHostMsgNeedKey)
./proxy/ppb_instance_proxy.cc:542:void PPB_Instance_Proxy::NeedKey(PP_Instance
instance,
./proxy/ppb_instance_proxy.cc:547:      new PpapiHostMsg_PPBInstance_NeedKey(
./proxy/ppb_instance_proxy.cc:1060:void
PPB_Instance_Proxy::OnHostMsgNeedKey(PP_Instance instance,
./proxy/ppb_instance_proxy.cc:1068:    enter.functions()->NeedKey(instance,
./proxy/ppb_instance_proxy.h:120:  virtual void NeedKey(PP_Instance instance,
./proxy/ppb_instance_proxy.h:226:  virtual void OnHostMsgNeedKey(PP_Instance
instance,
./native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c:2306:static void
Pnacl_M24_PPB_ContentDecryptor_Private_NeedKey(PP_Instance instance, struct
PP_Var* key_system, struct PP_Var* session_id, struct PP_Var* init_data) {
./native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c:2308: 
iface->NeedKey(instance, *key_system, *session_id, *init_data);
./native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c:4636:    .NeedKey =
(void (*)(PP_Instance instance, struct PP_Var key_system, struct PP_Var
session_id, struct PP_Var
init_data))&Pnacl_M24_PPB_ContentDecryptor_Private_NeedKey,

[jrummell, 2013/09/18 21:01:15]

Removed it in the .idl file, but looks like there are a few references
remaining. Done.

 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_KeyAdded,
                     PP_Instance /* instance */,
                     ppapi::proxy::SerializedVar /* key_system, String */,
                     ppapi::proxy::SerializedVar /* session_id, String */)
 IPC_MESSAGE_ROUTED5(PpapiHostMsg_PPBInstance_KeyMessage,
                     PP_Instance /* instance */,
                     ppapi::proxy::SerializedVar /* key_system, String */,
                     ppapi::proxy::SerializedVar /* session_id, String */,
                     ppapi::proxy::SerializedVar /* message, ArrayBuffer */,
                     ppapi::proxy::SerializedVar /* default_url, String */)
@@ skipping 988 matching lines @@
 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission,
                      PP_TalkPermission /* permission */)
 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply)
 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting)
 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply)
 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting)
 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply)
 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */)
 
 #endif  // !defined(OS_NACL) && !defined(NACL_WIN64)