Generalize Pepper CDM API decrypt and decode.

ppapi/cpp/private/content_decryptor_private.h

Index: ppapi/cpp/private/content_decryptor_private.h
diff --git a/ppapi/cpp/private/content_decryptor_private.h b/ppapi/cpp/private/content_decryptor_private.h
index 7a6189b5cbfc4ae592cc7f2c0665991c2e863a26..1ee330921924b518d97c4a158b5ae6a32a8e239f 100644
--- a/ppapi/cpp/private/content_decryptor_private.h
+++ b/ppapi/cpp/private/content_decryptor_private.h
@@ -36,9 +36,10 @@ class ContentDecryptor_Private {
   virtual void CancelKeyRequest(const std::string& session_id) = 0;
   virtual void Decrypt(pp::Buffer_Dev encrypted_buffer,
                        const PP_EncryptedBlockInfo& encrypted_block_info) = 0;
-  virtual void DecryptAndDecodeFrame(
-      pp::Buffer_Dev encrypted_frame,
-      const PP_EncryptedVideoFrameInfo& encrypted_video_frame_info) = 0;
+  virtual void DecryptAndDecode(
+      PP_StreamType decoder_type,
+      pp::Buffer_Dev encrypted_buffer,
+      const PP_EncryptedBlockInfo& encrypted_block_info) = 0;
 
   // PPB_ContentDecryptor_Private methods for passing data from the decryptor
   // to the browser.