Add content decryptor related structs and update PP{P|B}_ContentDecryptor_Private.

ppapi/c/private/ppb_content_decryptor_private.h

Index: ppapi/c/private/ppb_content_decryptor_private.h
diff --git a/ppapi/c/private/ppb_content_decryptor_private.h b/ppapi/c/private/ppb_content_decryptor_private.h
index 76309108e37c68d99cca45626af0584414a1f08d..101bfa9fc42f28330ecb02b70f71561076717975 100644
--- a/ppapi/c/private/ppb_content_decryptor_private.h
+++ b/ppapi/c/private/ppb_content_decryptor_private.h
@@ -4,7 +4,7 @@
  */
 
 /* From private/ppb_content_decryptor_private.idl,
- *   modified Tue Aug 14 11:53:03 2012.
+ *   modified Wed Aug 15 10:56:31 2012.
  */
 
 #ifndef PPAPI_C_PRIVATE_PPB_CONTENT_DECRYPTOR_PRIVATE_H_
@@ -16,6 +16,7 @@
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/pp_var.h"
+#include "ppapi/c/private/pp_decrypt_config.h"
 
 #define PPB_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_1 \
     "PPB_ContentDecryptor_Private;0.1"
@@ -150,12 +151,12 @@ struct PPB_ContentDecryptor_Private_0_1 {
    * <code>PPB_Buffer_Dev</code> resource that contains a decrypted data
    * block.
    *
-   * @param[in] request_id A unique value the browser can use to associate
-   * decrypted_block with a decrypt call.
+   * @param[in] tracking_info Tracking info the browser can use to associate
+   * decrypted_block with a decrypt call and/or an input (encrypted) buffer.
    */
   void (*DeliverBlock)(PP_Instance instance,
                        PP_Resource decrypted_block,
-                       int32_t request_id);
+                       const struct PP_DecryptTrackingInfo* tracking_info);
   /**
    * Called after the <code>DecryptAndDecode()</code> method on the
    * <code>PPP_ContentDecryptor_Private</code> interface completes to deliver
@@ -164,12 +165,12 @@ struct PPB_ContentDecryptor_Private_0_1 {
    * @param[in] decrypted_frame A <code>PP_Resource</code> corresponding to a
    * <code>PPB_Buffer_Dev</code> resource that contains a video frame.
    *
-   * @param[in] request_id A unique value the browser can use to associate
-   * decrypted_frame with a decrypt call.
+   * @param[in] tracking_info Tracking info the browser can use to associate
+   * decrypted_block with a decrypt call and/or an input (encrypted) buffer.
    */
   void (*DeliverFrame)(PP_Instance instance,
                        PP_Resource decrypted_frame,
-                       int32_t request_id);
+                       const struct PP_DecryptTrackingInfo* tracking_info);
   /**
    * Called after the <code>DecryptAndDecode()</code> method on the
    * <code>PPP_ContentDecryptor_Private</code> interface completes to
@@ -180,12 +181,12 @@ struct PPB_ContentDecryptor_Private_0_1 {
    * <code>PPB_Buffer_Dev</code> resource that contains a decrypted buffer
    * of decoded audio samples.
    *
-   * @param[in] request_id A unique value the browser can use to associate
-   * decrypted_samples with a decrypt call.
+   * @param[in] tracking_info Tracking info the browser can use to associate
+   * decrypted_block with a decrypt call and/or an input (encrypted) buffer.
    */
   void (*DeliverSamples)(PP_Instance instance,
                          PP_Resource decrypted_samples,
-                         int32_t request_id);
+                         const struct PP_DecryptTrackingInfo* tracking_info);
 };
 
 typedef struct PPB_ContentDecryptor_Private_0_1 PPB_ContentDecryptor_Private;