Call CDMWrapper from PpapiDecryptor.

ppapi/c/dev/ppp_content_decryptor_dev.h

Index: ppapi/c/dev/ppp_content_decryptor_dev.h
diff --git a/ppapi/c/dev/ppp_content_decryptor_dev.h b/ppapi/c/dev/ppp_content_decryptor_dev.h
index d650132e2f8a7073224c44655f829b311865cf8f..1aa09bc5b246b1782ef89cc394d3892282bbbb7c 100644
--- a/ppapi/c/dev/ppp_content_decryptor_dev.h
+++ b/ppapi/c/dev/ppp_content_decryptor_dev.h
@@ -3,11 +3,12 @@
  * found in the LICENSE file.
  */
 
-/* From dev/ppp_content_decryptor_dev.idl modified Mon Jul 16 17:58:10 2012. */
+/* From dev/ppp_content_decryptor_dev.idl modified Fri Aug  3 14:08:02 2012. */
 
 #ifndef PPAPI_C_DEV_PPP_CONTENT_DECRYPTOR_DEV_H_
 #define PPAPI_C_DEV_PPP_CONTENT_DECRYPTOR_DEV_H_
 
+#include "ppapi/c/dev/pp_decryption_buffer_dev.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_instance.h"
@@ -26,11 +27,11 @@
  * interface.
  */
 
+
 /**
  * @addtogroup Interfaces
  * @{
  */
-
 /**
  * <code>PPP_ContentDecryptor_Dev</code> structure contains the function
  * pointers the decryption plugin MUST implement to provide services needed by
@@ -44,43 +45,40 @@ struct PPP_ContentDecryptor_Dev_0_1 {
    * the media data that is required for use of the plugin's key system(s).
    */
   PP_Bool (*GenerateKeyRequest)(PP_Instance instance,
-                                struct PP_Var key_system,  /* String. */
-                                PP_Resource init_data);    /* PPB_Buffer. */
-
+                                struct PP_Var key_system,
+                                PP_Resource init_data);
+  /* PPB_Buffer. */
   /**
    * Provides a key or license to use for decrypting media data for session_id.
    */
   PP_Bool (*AddKey)(PP_Instance instance,
-                    struct PP_Var session_id,  /* String. */
-                    PP_Resource key);          /* PPB_Buffer. */
-
+                    struct PP_Var session_id,
+                    PP_Resource key);
+  /* PPB_Buffer. */
   /**
    * Cancels a key request for session_id.
    */
-  PP_Bool (*CancelKeyRequest)(PP_Instance instance,
-                              struct PP_Var session_id);  /* String. */
-
+  PP_Bool (*CancelKeyRequest)(PP_Instance instance, struct PP_Var session_id);
+  /* String. */
   /**
    * Decrypts the block and returns the unencrypted block. In the case of
    * media, the block contains encoded data.
    */
   PP_Bool (*Decrypt)(PP_Instance instance,
-                     PP_Resource encrypted_block,  /* PPB_Buffer. */
-                     struct PP_CompletionCallback callback);
-
+                     const struct PP_DecryptionBuffer_Dev* encrypted_buffer);
   /**
    * Decrypts the block then decodes it and returns the unencrypted raw
    * (decoded) frame.
    */
   PP_Bool (*DecryptAndDecode)(PP_Instance instance,
-                              PP_Resource encrypted_block,  /* PPB_Buffer. */
+                              PP_Resource encrypted_block,
                               struct PP_CompletionCallback callback);
 };
 
 typedef struct PPP_ContentDecryptor_Dev_0_1 PPP_ContentDecryptor_Dev;
-
 /**
  * @}
  */
 
 #endif  /* PPAPI_C_DEV_PPP_CONTENT_DECRYPTOR_DEV_H_ */
+