Update PPP side of Pepper CDM API to support video decoding.

webkit/media/crypto/ppapi/cdm_wrapper.cc

Index: webkit/media/crypto/ppapi/cdm_wrapper.cc
diff --git a/webkit/media/crypto/ppapi/cdm_wrapper.cc b/webkit/media/crypto/ppapi/cdm_wrapper.cc
index 75c69d255b73d4edda24eece3d69e9f9da9a2537..74420925fbaba247aaa29c2a6bde8c6de53dafd9 100644
--- a/webkit/media/crypto/ppapi/cdm_wrapper.cc
+++ b/webkit/media/crypto/ppapi/cdm_wrapper.cc
@@ -219,10 +219,8 @@ class CdmWrapper : public pp::Instance,
   }
 
   // PPP_ContentDecryptor_Private methods
-  // Note: As per comments in PPP_ContentDecryptor_Private, these calls should
-  // return false if the call was not forwarded to the CDM and should return
-  // true otherwise. Once the call reaches the CDM, the call result/status
-  // should be reported through the PPB_ContentDecryptor_Private interface.
+  // Note: Results of calls to these methods must be reported through the
+  // PPB_ContentDecryptor_Private interface.
   virtual void GenerateKeyRequest(const std::string& key_system,
                                   pp::VarArrayBuffer init_data) OVERRIDE;
   virtual void AddKey(const std::string& session_id,
@@ -232,9 +230,9 @@ class CdmWrapper : public pp::Instance,
   virtual void Decrypt(
       pp::Buffer_Dev encrypted_buffer,
       const PP_EncryptedBlockInfo& encrypted_block_info) OVERRIDE;
-  virtual void DecryptAndDecode(
-      pp::Buffer_Dev encrypted_buffer,
-      const PP_EncryptedBlockInfo& encrypted_block_info) OVERRIDE;
+  virtual void DecryptAndDecodeFrame(
+      pp::Buffer_Dev encrypted_frame,
+      const PP_EncryptedVideoFrameInfo& encrypted_video_frame_info) OVERRIDE;
 
  private:
   typedef linked_ptr<KeyMessageImpl> LinkedKeyMessage;
@@ -399,9 +397,10 @@ void CdmWrapper::Decrypt(pp::Buffer_Dev encrypted_buffer,
       encrypted_block_info.tracking_info));
 }
 
-void CdmWrapper::DecryptAndDecode(
-    pp::Buffer_Dev encrypted_buffer,
-    const PP_EncryptedBlockInfo& encrypted_block_info) {
+void CdmWrapper::DecryptAndDecodeFrame(
+    pp::Buffer_Dev encrypted_frame,
+    const PP_EncryptedVideoFrameInfo& encrypted_video_frame_info) {
+  // TODO(tomfinegan): Implement video decoding.
 }
 
 void CdmWrapper::KeyAdded(int32_t result, const std::string& session_id) {