Add decoder de-initialize and reset to the Pepper CDM API.

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 679abafc7ecbb2a8751313931f7a4f44002cfb4e..840358a63e609adf43ab4ab0fdc7504de5d2ae77 100644
--- a/webkit/media/crypto/ppapi/cdm_wrapper.cc
+++ b/webkit/media/crypto/ppapi/cdm_wrapper.cc
@@ -378,6 +378,8 @@ class CdmWrapper : public pp::Instance,
   virtual void Decrypt(
       pp::Buffer_Dev encrypted_buffer,
       const PP_EncryptedBlockInfo& encrypted_block_info) OVERRIDE;
+  virtual void ResetVideoDecoder(uint32_t request_id);
+  virtual void StopVideoDecoder(uint32_t request_id);
   virtual void DecryptAndDecodeFrame(
       pp::Buffer_Dev encrypted_frame,
       const PP_EncryptedVideoFrameInfo& encrypted_video_frame_info) OVERRIDE;
@@ -397,6 +399,8 @@ class CdmWrapper : public pp::Instance,
                     const cdm::Status& status,
                     const LinkedDecryptedBlock& decrypted_block,
                     const PP_DecryptTrackingInfo& tracking_info);
+  void DecoderReset(int32_t result, uint32_t request_id);
+  void DecoderStopped(int32_t result, uint32_t request_id);
   void DeliverFrame(int32_t result,
                     const cdm::Status& status,
                     const LinkedVideoFrame& video_frame,
@@ -530,6 +534,20 @@ void CdmWrapper::Decrypt(pp::Buffer_Dev encrypted_buffer,
       encrypted_block_info.tracking_info));
 }
 
+void CdmWrapper::ResetVideoDecoder(uint32_t request_id) {
+  // TODO(tomfinegan): Implement ResetVideoDecoder in clear key CDM, and call
+  // it here.
+  CallOnMain(callback_factory_.NewCallback(&CdmWrapper::DecoderReset,
+                                           request_id));
+}
+
+void CdmWrapper::StopVideoDecoder(uint32_t request_id) {
+  // TODO(tomfinegan): Implement StopVideoDecoder in clear key CDM, and call it
+  // here.
+  CallOnMain(callback_factory_.NewCallback(&CdmWrapper::DecoderStopped,
+                                           request_id));
+}
+
 void CdmWrapper::DecryptAndDecodeFrame(
     pp::Buffer_Dev encrypted_frame,
     const PP_EncryptedVideoFrameInfo& encrypted_video_frame_info) {
@@ -607,6 +625,14 @@ void CdmWrapper::DeliverBlock(int32_t result,
   pp::ContentDecryptor_Private::DeliverBlock(buffer, decrypted_block_info);
 }
 
+void CdmWrapper::DecoderReset(int32_t result, uint32_t request_id) {
+  pp::ContentDecryptor_Private::DecoderReset(request_id);
+}
+
+void CdmWrapper::DecoderStopped(int32_t result, uint32_t request_id) {
+  pp::ContentDecryptor_Private::DecoderStopped(request_id);
+}
+
 void CdmWrapper::DeliverFrame(
     int32_t result,
     const cdm::Status& status,