Handle plugin instance crash in ContentDecryptorDelegate.

content/renderer/media/crypto/ppapi_decryptor.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
 #define CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 55 matching lines @@
   virtual void DecryptAndDecodeAudio(
       const scoped_refptr<media::DecoderBuffer>& encrypted,
       const AudioDecodeCB& audio_decode_cb) OVERRIDE;
   virtual void DecryptAndDecodeVideo(
       const scoped_refptr<media::DecoderBuffer>& encrypted,
       const VideoDecodeCB& video_decode_cb) OVERRIDE;
   virtual void ResetDecoder(StreamType stream_type) OVERRIDE;
   virtual void DeinitializeDecoder(StreamType stream_type) OVERRIDE;
 
  private:
-  PpapiDecryptor(const scoped_refptr<PepperPluginInstanceImpl>& plugin_instance,
+  PpapiDecryptor(const std::string& key_system,
+                 const scoped_refptr<PepperPluginInstanceImpl>& plugin_instance,
                  ContentDecryptorDelegate* plugin_cdm_delegate,
                  const media::SessionCreatedCB& session_created_cb,
                  const media::SessionMessageCB& session_message_cb,
                  const media::SessionReadyCB& session_ready_cb,
                  const media::SessionClosedCB& session_closed_cb,
                  const media::SessionErrorCB& session_error_cb,
                  const base::Closure& destroy_plugin_cb);
 
   void ReportFailureToCallPlugin(uint32 session_id);
 
   void OnDecoderInitialized(StreamType stream_type, bool success);
 
   // Callbacks for |plugin_cdm_delegate_| to fire session events.
   void OnSessionCreated(uint32 session_id, const std::string& web_session_id);
   void OnSessionMessage(uint32 session_id,
                         const std::vector<uint8>& message,
                         const std::string& destination_url);
   void OnSessionReady(uint32 session_id);
   void OnSessionClosed(uint32 session_id);
   void OnSessionError(uint32 session_id,
                       media::MediaKeys::KeyError error_code,
                       int system_code);
 
+  // Callback to notify unexpected error happened in |plugin_cdm_delegate_|.
+  // After this call, |plugin_cdm_delegate_| should not be used.

[ddorwin, 2014/01/08 23:40:32]

Between these two, maybe explicitly note that plugin errors are terminal.

[xhwang, 2014/01/09 01:58:49]

Done.

+  void OnPluginError();
+
   base::WeakPtr<PpapiDecryptor> weak_this_;
 
   // Hold a reference of the plugin instance to make sure the plugin outlives
   // the |plugin_cdm_delegate_|. This is needed because |plugin_cdm_delegate_|
   // is owned by the |plugin_instance_|.
   scoped_refptr<PepperPluginInstanceImpl> plugin_instance_;
 
   ContentDecryptorDelegate* plugin_cdm_delegate_;
 
   // Callbacks for firing session events.
@@ skipping 14 matching lines @@
   NewKeyCB new_video_key_cb_;
 
   base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_