Generalize Pepper CDM API decrypt and decode.

ppapi/cpp/private/content_decryptor_private.cc

Index: ppapi/cpp/private/content_decryptor_private.cc
diff --git a/ppapi/cpp/private/content_decryptor_private.cc b/ppapi/cpp/private/content_decryptor_private.cc
index 7dbce34d6edd45da8fe101a2a2928e754f98d61e..b1ac745c3b11c0787267ec654d8d5e303dc70721 100644
--- a/ppapi/cpp/private/content_decryptor_private.cc
+++ b/ppapi/cpp/private/content_decryptor_private.cc
@@ -105,20 +105,19 @@ void Decrypt(PP_Instance instance,
       *encrypted_block_info);
 }
 
-void DecryptAndDecodeFrame(
-    PP_Instance instance,
-    PP_Resource encrypted_resource,
-    const PP_EncryptedVideoFrameInfo* encrypted_video_frame_info) {
+void DecryptAndDecode(PP_Instance instance,
+                      PP_Resource encrypted_resource,
+                      const PP_EncryptedMediaInfo* encrypted_media_info) {
   void* object =
       Instance::GetPerInstanceObject(instance, kPPPContentDecryptorInterface);
   if (!object)
     return;
 
-  pp::Buffer_Dev encrypted_frame(pp::PassRef(), encrypted_resource);
+  pp::Buffer_Dev encrypted_buffer(pp::PassRef(), encrypted_resource);
 
-  static_cast<ContentDecryptor_Private*>(object)->DecryptAndDecodeFrame(
-      encrypted_frame,
-      *encrypted_video_frame_info);
+  static_cast<ContentDecryptor_Private*>(object)->DecryptAndDecode(
+      encrypted_buffer,
+      *encrypted_media_info);
 }
 
 const PPP_ContentDecryptor_Private ppp_content_decryptor = {
@@ -126,7 +125,7 @@ const PPP_ContentDecryptor_Private ppp_content_decryptor = {
   &AddKey,
   &CancelKeyRequest,
   &Decrypt,
-  &DecryptAndDecodeFrame
+  &DecryptAndDecode
 };
 
 template <> const char* interface_name<PPB_ContentDecryptor_Private>() {