media: Cancel MediaCryptoReadyCB during player destruction.

BUG=b/26593586

Review URL: https://codereview.chromium.org/1601743007

Cr-Commit-Position: refs/heads/master@{#370768}

media/base/android/media_codec_player.cc

@@ -102,6 +102,10 @@ MediaCodecPlayer::~MediaCodecPlayer()
     audio_decoder_->ReleaseDecoderResources();
 
   if (cdm_) {
+    // Cancel previously registered callback (if any).
+    static_cast<MediaDrmBridge*>(cdm_.get())
+        ->SetMediaCryptoReadyCB(MediaDrmBridge::MediaCryptoReadyCB());
+
     DCHECK(cdm_registration_id_);
     static_cast<MediaDrmBridge*>(cdm_.get())
         ->UnregisterPlayer(cdm_registration_id_);

media/base/android/media_source_player.cc

@@ -74,6 +74,10 @@ MediaSourcePlayer::~MediaSourcePlayer() {
   Release();
   DCHECK_EQ(!cdm_, !cdm_registration_id_);
   if (cdm_) {
+    // Cancel previously registered callback (if any).
+    static_cast<MediaDrmBridge*>(cdm_.get())
+        ->SetMediaCryptoReadyCB(MediaDrmBridge::MediaCryptoReadyCB());
+
     static_cast<MediaDrmBridge*>(cdm_.get())
         ->UnregisterPlayer(cdm_registration_id_);
     cdm_registration_id_ = 0;