Call CDMWrapper from PpapiDecryptor.

ppapi/cpp/dev/content_decryptor_dev.cc

 // 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.
 
 #include "ppapi/cpp/dev/content_decryptor_dev.h"
 
 #include "ppapi/c/dev/ppb_content_decryptor_dev.h"
 #include "ppapi/c/dev/ppp_content_decryptor_dev.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/instance_handle.h"
@@ skipping 34 matching lines @@
 PP_Bool CancelKeyRequest(PP_Instance instance,
                          PP_Var session_id) {
   void* object =
       Instance::GetPerInstanceObject(instance, kPPPContentDecryptorInterface);
   if (!object)
     return PP_FALSE;
   return PP_FromBool(
       static_cast<ContentDecryptor_Dev*>(object)->CancelKeyRequest(session_id));
 }
 
-
 PP_Bool Decrypt(PP_Instance instance,
-                PP_Resource encrypted_block,
-                PP_CompletionCallback callback) {
+                const struct PP_DecryptionBuffer_Dev* encrypted_buffer) {
   void* object =
       Instance::GetPerInstanceObject(instance, kPPPContentDecryptorInterface);
   if (!object)
     return PP_FALSE;
+  if (!encrypted_buffer)
+    return PP_FALSE;
   return PP_FromBool(
-      static_cast<ContentDecryptor_Dev*>(object)->Decrypt(encrypted_block,
-                                                          callback));
+      static_cast<ContentDecryptor_Dev*>(object)->Decrypt(*encrypted_buffer));
 }
 
 PP_Bool DecryptAndDecode(PP_Instance instance,
                          PP_Resource encrypted_block,
                          PP_CompletionCallback callback) {
   void* object =
       Instance::GetPerInstanceObject(instance, kPPPContentDecryptorInterface);
   if (!object)
     return PP_FALSE;
   return PP_FromBool(
@@ skipping 68 matching lines @@
     get_interface<PPB_ContentDecryptor_Dev>()->KeyError(
         associated_instance_.pp_instance(),
         key_system,
         session_id,
         media_error,
         system_error);
   }
 }
 
 void ContentDecryptor_Dev::DeliverBlock(PP_Resource decrypted_block,
-                                        PP_CompletionCallback callback) {
+                                        uint32_t id) {
   if (has_interface<PPB_ContentDecryptor_Dev>()) {
     get_interface<PPB_ContentDecryptor_Dev>()->DeliverBlock(
         associated_instance_.pp_instance(),
         decrypted_block,
-        callback);
+        id);
   }
 }
 
 void ContentDecryptor_Dev::DeliverFrame(PP_Resource decrypted_frame,
                                         PP_CompletionCallback callback) {
   if (has_interface<PPB_ContentDecryptor_Dev>()) {
     get_interface<PPB_ContentDecryptor_Dev>()->DeliverFrame(
         associated_instance_.pp_instance(),
         decrypted_frame,
         callback);
   }
 }
 
 void ContentDecryptor_Dev::DeliverSamples(PP_Resource decrypted_samples,
                                           PP_CompletionCallback callback) {
   if (has_interface<PPB_ContentDecryptor_Dev>()) {
     get_interface<PPB_ContentDecryptor_Dev>()->DeliverSamples(
         associated_instance_.pp_instance(),
         decrypted_samples,
         callback);
   }
 }
 
 }  // namespace pp